From a09e8b13568e210a03ca4ad64e8552c0edea07c5 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 11 Dec 2022 01:15:13 +0000 Subject: [PATCH] ncurses 6.3 - patch 20221210 + add minimal -h/-V getopt logic to the remaining test-programs. + free new_pair() data in delscreen (report by "magiblot"). + add clarification of the scope of dynamic variables in terminfo(5). + remove a stray '/' from description of %g in terminfo(5). --- NEWS | 8 +- VERSION | 2 +- dist.mk | 4 +- doc/html/man/adacurses6-config.1.html | 2 +- doc/html/man/captoinfo.1m.html | 2 +- doc/html/man/clear.1.html | 2 +- doc/html/man/form.3x.html | 2 +- doc/html/man/infocmp.1m.html | 2 +- doc/html/man/infotocap.1m.html | 2 +- doc/html/man/menu.3x.html | 2 +- doc/html/man/ncurses.3x.html | 2 +- doc/html/man/ncurses6-config.1.html | 2 +- doc/html/man/panel.3x.html | 2 +- doc/html/man/tabs.1.html | 2 +- doc/html/man/terminfo.5.html | 951 +++++++++++++------------- doc/html/man/tic.1m.html | 2 +- doc/html/man/toe.1m.html | 2 +- doc/html/man/tput.1.html | 2 +- doc/html/man/tset.1.html | 2 +- man/terminfo.tail | 15 +- ncurses/base/lib_set_term.c | 6 +- package/debian-mingw/changelog | 4 +- package/debian-mingw64/changelog | 4 +- package/debian/changelog | 4 +- package/mingw-ncurses.nsi | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- test/back_ground.c | 4 +- test/background.c | 4 +- test/blue.c | 39 +- test/bs.c | 113 +-- test/chgat.c | 41 +- test/clip_printw.c | 39 +- test/color_content.c | 4 +- test/color_set.c | 38 +- test/combine.c | 4 +- test/demo_altkeys.c | 37 +- test/demo_defkey.c | 37 +- test/demo_keyok.c | 37 +- test/demo_termcap.c | 5 +- test/demo_terminfo.c | 4 +- test/ditto.c | 133 ++-- test/dots.c | 8 +- test/dots_mvcur.c | 8 +- test/dots_termcap.c | 5 +- test/dup_field.c | 39 +- test/echochar.c | 5 +- test/extended_color.c | 4 +- test/firstlast.c | 42 +- test/foldkeys.c | 39 +- test/form_driver_w.c | 54 +- test/inch_wide.c | 44 +- test/inchs.c | 44 +- test/ins_wide.c | 4 +- test/insdelln.c | 41 +- test/inserts.c | 4 +- test/list_keys.c | 6 +- test/lrtest.c | 58 +- test/move_field.c | 39 +- test/movewindow.c | 39 +- test/newdemo.c | 38 +- test/pair_content.c | 4 +- test/railroad.c | 44 +- test/redraw.c | 4 +- test/savescreen.c | 4 +- test/sp_tinfo.c | 4 +- test/tclock.c | 4 +- test/test_add_wchstr.c | 4 +- test/test_addchstr.c | 4 +- test/test_addstr.c | 4 +- test/test_addwstr.c | 4 +- test/test_arrays.c | 6 +- test/test_delwin.c | 38 +- test/test_get_wstr.c | 44 +- test/test_getstr.c | 44 +- test/test_instr.c | 44 +- test/test_inwstr.c | 44 +- test/test_opaque.c | 44 +- test/test_setupterm.c | 4 +- test/test_sgr.c | 4 +- test/test_termattrs.c | 7 +- test/test_tparm.c | 4 +- test/test_unget_wch.c | 38 +- test/test_vid_puts.c | 4 +- test/test_vidputs.c | 7 +- test/testaddch.c | 42 +- test/testcurs.c | 40 +- test/testscanw.c | 50 +- 89 files changed, 1810 insertions(+), 832 deletions(-) diff --git a/NEWS b/NEWS index 499ee67b..2cc4afc3 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3885 2022/12/03 23:58:35 tom Exp $ +-- $Id: NEWS,v 1.3887 2022/12/11 00:21:55 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,12 @@ 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. +20221210 + + add minimal -h/-V getopt logic to the remaining test-programs. + + free new_pair() data in delscreen (report by "magiblot"). + + add clarification of the scope of dynamic variables in terminfo(5). + + remove a stray '/' from description of %g in terminfo(5). + 20221203 + add -h usage and -V version options to the test-programs which use getopt. diff --git a/VERSION b/VERSION index 3f2f107f..98790fed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.3 20221203 +5:0:10 6.3 20221210 diff --git a/dist.mk b/dist.mk index 800d188e..cba14572 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1515 2022/12/03 11:17:39 tom Exp $ +# $Id: dist.mk,v 1.1516 2022/12/10 11:24:32 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 3 -NCURSES_PATCH = 20221203 +NCURSES_PATCH = 20221210 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/doc/html/man/adacurses6-config.1.html b/doc/html/man/adacurses6-config.1.html index c365ca6a..51d6bd6e 100644 --- a/doc/html/man/adacurses6-config.1.html +++ b/doc/html/man/adacurses6-config.1.html @@ -126,7 +126,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/doc/html/man/captoinfo.1m.html b/doc/html/man/captoinfo.1m.html
index b832f958..dc1d3add 100644
--- a/doc/html/man/captoinfo.1m.html
+++ b/doc/html/man/captoinfo.1m.html
@@ -199,7 +199,7 @@

SEE ALSO

        infocmp(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).

AUTHOR

diff --git a/doc/html/man/clear.1.html b/doc/html/man/clear.1.html
index f85d874e..ddb94a9f 100644
--- a/doc/html/man/clear.1.html
+++ b/doc/html/man/clear.1.html
@@ -150,7 +150,7 @@

SEE ALSO

        tput(1), terminfo(5), xterm(1).
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/doc/html/man/form.3x.html b/doc/html/man/form.3x.html
index 771da3cc..08a56bff 100644
--- a/doc/html/man/form.3x.html
+++ b/doc/html/man/form.3x.html
@@ -248,7 +248,7 @@
        curses(3x) and related pages whose names  begin  "form_"  for  detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/doc/html/man/infocmp.1m.html b/doc/html/man/infocmp.1m.html
index 5dba8224..64bbe400 100644
--- a/doc/html/man/infocmp.1m.html
+++ b/doc/html/man/infocmp.1m.html
@@ -514,7 +514,7 @@
 
        https://invisible-island.net/ncurses/tctest.html
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).

AUTHOR

diff --git a/doc/html/man/infotocap.1m.html b/doc/html/man/infotocap.1m.html
index 2f6a598b..87fbec05 100644
--- a/doc/html/man/infotocap.1m.html
+++ b/doc/html/man/infotocap.1m.html
@@ -91,7 +91,7 @@

SEE ALSO

        infocmp(1m), tic(1m), curses(3x), terminfo(5)
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).

AUTHOR

diff --git a/doc/html/man/menu.3x.html b/doc/html/man/menu.3x.html
index ee562d8f..4f7409e2 100644
--- a/doc/html/man/menu.3x.html
+++ b/doc/html/man/menu.3x.html
@@ -223,7 +223,7 @@
        curses(3x) and related pages whose names  begin  "menu_"  for  detailed
        descriptions of the entry points.
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/doc/html/man/ncurses.3x.html b/doc/html/man/ncurses.3x.html
index 8a8da0bc..d6b03df9 100644
--- a/doc/html/man/ncurses.3x.html
+++ b/doc/html/man/ncurses.3x.html
@@ -60,7 +60,7 @@
        method of updating  character  screens  with  reasonable  optimization.
        This  implementation  is  "new  curses"  (ncurses)  and is the approved
        replacement for 4.4BSD classic curses,  which  has  been  discontinued.
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
        The  ncurses  library emulates the curses library of System V Release 4
        UNIX, and XPG4 (X/Open Portability Guide) curses  (also  known  as  XSI
diff --git a/doc/html/man/ncurses6-config.1.html b/doc/html/man/ncurses6-config.1.html
index 49fc5221..70dbb09d 100644
--- a/doc/html/man/ncurses6-config.1.html
+++ b/doc/html/man/ncurses6-config.1.html
@@ -113,7 +113,7 @@

SEE ALSO

        curses(3x)
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/doc/html/man/panel.3x.html b/doc/html/man/panel.3x.html
index f320b38e..84d34f8f 100644
--- a/doc/html/man/panel.3x.html
+++ b/doc/html/man/panel.3x.html
@@ -281,7 +281,7 @@

SEE ALSO

        curses(3x), curs_variables(3x),
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).

AUTHOR

diff --git a/doc/html/man/tabs.1.html b/doc/html/man/tabs.1.html
index 693a85e1..c3edf76a 100644
--- a/doc/html/man/tabs.1.html
+++ b/doc/html/man/tabs.1.html
@@ -252,7 +252,7 @@

SEE ALSO

        infocmp(1m), tset(1), curses(3x), terminfo(5).
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/doc/html/man/terminfo.5.html b/doc/html/man/terminfo.5.html
index 02f61af6..d92aff11 100644
--- a/doc/html/man/terminfo.5.html
+++ b/doc/html/man/terminfo.5.html
@@ -35,7 +35,7 @@
   * @Id: terminfo.head,v 1.42 2021/12/25 17:39:16 tom Exp @
   * Head of terminfo man page ends here
   ****************************************************************************
-  * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+  * Copyright 2018-2021,2022 Thomas E. Dickey                                *
   * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
   *                                                                          *
   * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -62,7 +62,7 @@
   * sale, use or other dealings in this Software without prior written       *
   * authorization.                                                           *
   ****************************************************************************
-  * @Id: terminfo.tail,v 1.110 2021/12/25 20:14:56 tom Exp @
+  * @Id: terminfo.tail,v 1.113 2022/12/10 19:51:10 tom Exp @
   *.in -2
   *.in +2
   *.in -2
@@ -106,7 +106,7 @@
        have, by specifying how to perform screen operations, and by specifying
        padding requirements and initialization sequences.
 
-       This manual describes ncurses version 6.3 (patch 20221126).
+       This manual describes ncurses version 6.3 (patch 20221210).

Terminfo Entry Syntax

@@ -1460,7 +1460,7 @@
        %P[a-z]
             set dynamic variable [a-z] to pop()
 
-       %g[a-z]/
+       %g[a-z]
             get dynamic variable [a-z] and push it
 
        %P[A-Z]
@@ -1496,9 +1496,14 @@
                 variables in persistent storage, initialized to zeros.
 
             o   Beginning  with version 6.3, ncurses stores static and dynamic
-                variables  in  the  same  manner  as   SVr4.    Unlike   other
-                implementations,  ncurses  zeros  dynamic variables before the
-                first %g or %P operator.
+                variables in the same manner as SVr4.
+
+                o   Unlike  other  implementations,  ncurses   zeros   dynamic
+                    variables before the first %g or %P operator.
+
+                o   Like  SVr2,  the  scope of dynamic variables in ncurses is
+                    within the current call to tparm.  Use static variables if
+                    persistent storage is needed.
 
        %'c' char constant c
 
@@ -1526,8 +1531,8 @@
 
        %? expr %t thenpart %e elsepart %;
             This forms an if-then-else.  The %e elsepart is optional.  Usually
-            the  %?  expr  part  pushes a value onto the stack, and %t pops it
-            from the stack, testing if it is nonzero (true).  If  it  is  zero
+            the %? expr part pushes a value onto the stack,  and  %t  pops  it
+            from  the  stack,  testing if it is nonzero (true).  If it is zero
             (false), control passes to the %e (else) part.
 
             It is possible to form else-if's a la Algol 68:
@@ -1535,81 +1540,81 @@
 
             where ci are conditions, bi are bodies.
 
-            Use  the  -f  option of tic or infocmp to see the structure of if-
+            Use the -f option of tic or infocmp to see the  structure  of  if-
             then-else's.  Some strings, e.g., sgr can be very complicated when
-            written  on  one line.  The -f option splits the string into lines
+            written on one line.  The -f option splits the string  into  lines
             with the parts indented.
 
-       Binary operations are in postfix form with the operands  in  the  usual
-       order.   That  is,  to  get  x-5  one would use "%gx%{5}%-".  %P and %g
+       Binary  operations  are  in postfix form with the operands in the usual
+       order.  That is, to get x-5 one  would  use  "%gx%{5}%-".   %P  and  %g
        variables are persistent across escape-string evaluations.
 
-       Consider the HP2645, which, to get to row 3 and column 12, needs to  be
-       sent  \E&a12c03Y padded for 6 milliseconds.  Note that the order of the
-       rows and columns is inverted here, and that  the  row  and  column  are
-       printed    as    two    digits.     Thus    its   cup   capability   is
+       Consider  the HP2645, which, to get to row 3 and column 12, needs to be
+       sent \E&a12c03Y padded for 6 milliseconds.  Note that the order of  the
+       rows  and  columns  is  inverted  here, and that the row and column are
+       printed   as   two   digits.     Thus    its    cup    capability    is
        "cup=6\E&%p2%2dc%p1%2dY".
 
-       The Microterm ACT-IV needs the current row and column sent preceded  by
-       a   ^T,   with   the   row   and   column  simply  encoded  in  binary,
-       "cup=^T%p1%c%p2%c".  Terminals which  use  "%c"  need  to  be  able  to
-       backspace  the cursor (cub1), and to move the cursor up one line on the
-       screen (cuu1).  This is necessary because it  is  not  always  safe  to
-       transmit  \n ^D and \r, as the system may change or discard them.  (The
-       library routines dealing with terminfo set tty modes so that  tabs  are
-       never  expanded, so \t is safe to send.  This turns out to be essential
+       The  Microterm ACT-IV needs the current row and column sent preceded by
+       a  ^T,  with  the  row   and   column   simply   encoded   in   binary,
+       "cup=^T%p1%c%p2%c".   Terminals  which  use  "%c"  need  to  be able to
+       backspace the cursor (cub1), and to move the cursor up one line on  the
+       screen  (cuu1).   This  is  necessary  because it is not always safe to
+       transmit \n ^D and \r, as the system may change or discard them.   (The
+       library  routines  dealing with terminfo set tty modes so that tabs are
+       never expanded, so \t is safe to send.  This turns out to be  essential
        for the Ann Arbor 4080.)
 
-       A final example is the LSI ADM-3a, which uses row and column offset  by
+       A  final example is the LSI ADM-3a, which uses row and column offset by
        a blank character, thus "cup=\E=%p1%' '%+%c%p2%' '%+%c".  After sending
-       "\E=", this pushes the first parameter, pushes the ASCII  value  for  a
+       "\E=",  this  pushes  the first parameter, pushes the ASCII value for a
        space (32), adds them (pushing the sum on the stack in place of the two
-       previous values) and outputs that value as a character.  Then the  same
-       is  done for the second parameter.  More complex arithmetic is possible
+       previous  values) and outputs that value as a character.  Then the same
+       is done for the second parameter.  More complex arithmetic is  possible
        using the stack.

Cursor Motions

-       If the terminal has a fast way to home the cursor (to very  upper  left
-       corner  of screen) then this can be given as home; similarly a fast way
-       of getting to the lower left-hand corner can be given as ll;  this  may
+       If  the  terminal has a fast way to home the cursor (to very upper left
+       corner of screen) then this can be given as home; similarly a fast  way
+       of  getting  to the lower left-hand corner can be given as ll; this may
        involve going up with cuu1 from the home position, but a program should
        never do this itself (unless ll does) because it can make no assumption
-       about  the  effect  of moving up from the home position.  Note that the
-       home position is the same as addressing  to  (0,0):  to  the  top  left
-       corner  of  the  screen,  not of memory.  (Thus, the \EH sequence on HP
+       about the effect of moving up from the home position.   Note  that  the
+       home  position  is  the  same  as  addressing to (0,0): to the top left
+       corner of the screen, not of memory.  (Thus, the  \EH  sequence  on  HP
        terminals cannot be used for home.)
 
        If the terminal has row or column absolute cursor addressing, these can
-       be  given  as  single  parameter  capabilities hpa (horizontal position
-       absolute) and vpa (vertical position absolute).   Sometimes  these  are
-       shorter  than  the  more  general  two  parameter sequence (as with the
-       hp2645)  and  can  be  used  in  preference  to  cup.   If  there   are
-       parameterized  local  motions  (e.g., move n spaces to the right) these
-       can be given as  cud,  cub,  cuf,  and  cuu  with  a  single  parameter
-       indicating  how many spaces to move.  These are primarily useful if the
+       be given as single  parameter  capabilities  hpa  (horizontal  position
+       absolute)  and  vpa  (vertical position absolute).  Sometimes these are
+       shorter than the more general  two  parameter  sequence  (as  with  the
+       hp2645)   and  can  be  used  in  preference  to  cup.   If  there  are
+       parameterized local motions (e.g., move n spaces to  the  right)  these
+       can  be  given  as  cud,  cub,  cuf,  and  cuu  with a single parameter
+       indicating how many spaces to move.  These are primarily useful if  the
        terminal does not have cup, such as the TEKTRONIX 4025.
 
-       If the terminal needs to be in a special mode when  running  a  program
+       If  the  terminal  needs to be in a special mode when running a program
        that uses these capabilities, the codes to enter and exit this mode can
-       be given as smcup and rmcup.  This arises, for example, from  terminals
-       like  the  Concept  with more than one page of memory.  If the terminal
-       has only memory relative cursor  addressing  and  not  screen  relative
-       cursor  addressing,  a  one  screen-sized window must be fixed into the
+       be  given as smcup and rmcup.  This arises, for example, from terminals
+       like the Concept with more than one page of memory.   If  the  terminal
+       has  only  memory  relative  cursor  addressing and not screen relative
+       cursor addressing, a one screen-sized window must  be  fixed  into  the
        terminal for cursor addressing to work properly.  This is also used for
-       the  TEKTRONIX  4025,  where smcup sets the command character to be the
-       one used by terminfo.  If the  smcup  sequence  will  not  restore  the
-       screen  after  an  rmcup  sequence  is  output  (to  the state prior to
+       the TEKTRONIX 4025, where smcup sets the command character  to  be  the
+       one  used  by  terminfo.   If  the  smcup sequence will not restore the
+       screen after an rmcup  sequence  is  output  (to  the  state  prior  to
        outputting rmcup), specify nrrmc.

Margins

-       SVr4 (and X/Open Curses) list several string capabilities  for  setting
-       margins.   Two  were  intended  for use with terminals, and another six
+       SVr4  (and  X/Open Curses) list several string capabilities for setting
+       margins.  Two were intended for use with  terminals,  and  another  six
        were intended for use with printers.
 
        o   The two terminal capabilities assume that the terminal may have the
-           capability  of  setting the left and/or right margin at the current
+           capability of setting the left and/or right margin at  the  current
            cursor column position.
 
        o   The printer capabilities assume that the printer may have two types
@@ -1618,31 +1623,31 @@
            o   the ability to set a top and/or bottom margin using the current
                line position, and
 
-           o   parameterized capabilities for setting the top,  bottom,  left,
+           o   parameterized  capabilities  for setting the top, bottom, left,
                right margins given the number of rows or columns.
 
-       In  practice,  the  categorization into "terminal" and "printer" is not
+       In practice, the categorization into "terminal" and  "printer"  is  not
        suitable:
 
-       o   The AT&T SVr4 terminal database uses  smgl  four  times,  for  AT&T
+       o   The  AT&T  SVr4  terminal  database  uses smgl four times, for AT&T
            hardware.
 
-           Three  of  the  four  are  printers.   They lack the ability to set
+           Three of the four are printers.   They  lack  the  ability  to  set
            left/right margins by specifying the column.
 
-       o   Other (non-AT&T) terminals may support margins but using  different
+       o   Other  (non-AT&T) terminals may support margins but using different
            assumptions from AT&T.
 
-           For  instance,  the DEC VT420 supports left/right margins, but only
+           For instance, the DEC VT420 supports left/right margins,  but  only
            using a column parameter.  As an added complication, the VT420 uses
-           two  settings to fully enable left/right margins (left/right margin
-           mode, and origin mode).  The  former  enables  the  margins,  which
-           causes  printed  text  to  wrap  within  margins, but the latter is
+           two settings to fully enable left/right margins (left/right  margin
+           mode,  and  origin  mode).   The  former enables the margins, which
+           causes printed text to wrap  within  margins,  but  the  latter  is
            needed to prevent cursor-addressing outside those margins.
 
-       o   Both DEC VT420 left/right margins are set  with  a  single  control
+       o   Both  DEC  VT420  left/right  margins are set with a single control
            sequence.  If either is omitted, the corresponding margin is set to
-           the left or right edge of the  display  (rather  than  leaving  the
+           the  left  or  right  edge  of the display (rather than leaving the
            margin unmodified).
 
        These are the margin-related capabilities:
@@ -1660,232 +1665,232 @@
                 smglr      Set both left and right margins to L and R
                 smgtb      Set both top and bottom margins to T and B
 
-       When  writing  an  application that uses these string capabilities, the
-       pairs should be first checked to see if each capability in the pair  is
+       When writing an application that uses these  string  capabilities,  the
+       pairs  should be first checked to see if each capability in the pair is
        set or only one is set:
 
-       o   If  both  smglp  and  smgrp  are  set,  each  is used with a single
-           argument, N, that gives the column number of  the  left  and  right
+       o   If both smglp and smgrp  are  set,  each  is  used  with  a  single
+           argument,  N,  that  gives  the column number of the left and right
            margin, respectively.
 
-       o   If  both  smgtp  and smgbp are set, each is used to set the top and
+       o   If both smgtp and smgbp are set, each is used to set  the  top  and
            bottom margin, respectively:
 
            o   smgtp is used with a single argument, N, the line number of the
                top margin.
 
-           o   smgbp  is  used with two arguments, N and M, that give the line
+           o   smgbp is used with two arguments, N and M, that give  the  line
                number of the bottom margin, the first counting from the top of
-               the  page  and  the  second  counting  from  the  bottom.  This
-               accommodates the two styles of specifying the bottom margin  in
+               the page  and  the  second  counting  from  the  bottom.   This
+               accommodates  the two styles of specifying the bottom margin in
                different manufacturers' printers.
 
-           When  designing  a terminfo entry for a printer that has a settable
-           bottom margin, only the first or second argument  should  be  used,
+           When designing a terminfo entry for a printer that has  a  settable
+           bottom  margin,  only  the first or second argument should be used,
            depending on the printer.  When developing an application that uses
            smgbp to set the bottom margin, both arguments must be given.
 
        Conversely, when only one capability in the pair is set:
 
-       o   If only one of smglp and smgrp is set, then it  is  used  with  two
+       o   If  only  one  of  smglp and smgrp is set, then it is used with two
            arguments, the column number of the left and right margins, in that
            order.
 
-       o   Likewise, if only one of smgtp and smgbp is set, then  it  is  used
-           with  two  arguments  that give the top and bottom margins, in that
+       o   Likewise,  if  only  one of smgtp and smgbp is set, then it is used
+           with two arguments that give the top and bottom  margins,  in  that
            order, counting from the top of the page.
 
            When designing a terminfo entry for a printer that requires setting
-           both  left and right or top and bottom margins simultaneously, only
-           one capability in the pairs smglp and  smgrp  or  smgtp  and  smgbp
+           both left and right or top and bottom margins simultaneously,  only
+           one  capability  in  the  pairs  smglp and smgrp or smgtp and smgbp
            should be defined, leaving the other unset.
 
-       Except  for  very  old terminal descriptions, e.g., those developed for
-       SVr4, the scheme just described  should  be  considered  obsolete.   An
+       Except for very old terminal descriptions, e.g.,  those  developed  for
+       SVr4,  the  scheme  just  described  should be considered obsolete.  An
        improved set of capabilities was added late in the SVr4 releases (smglr
-       and smgtb),  which  explicitly  use  two  parameters  for  setting  the
+       and  smgtb),  which  explicitly  use  two  parameters  for  setting the
        left/right or top/bottom margins.
 
        When setting margins, the line- and column-values are zero-based.
 
-       The  mgc  string  capability  should  be defined.  Applications such as
+       The mgc string capability should  be  defined.   Applications  such  as
        tabs(1) rely upon this to reset all margins.

Area Clears

-       If the terminal can clear from the current position to the end  of  the
-       line,  leaving  the cursor where it is, this should be given as el.  If
-       the terminal can clear from the beginning of the line  to  the  current
-       position  inclusive,  leaving  the  cursor  where it is, this should be
-       given as el1.  If the terminal can clear from the current  position  to
-       the  end  of  the display, then this should be given as ed.  Ed is only
+       If  the  terminal can clear from the current position to the end of the
+       line, leaving the cursor where it is, this should be given as  el.   If
+       the  terminal  can  clear from the beginning of the line to the current
+       position inclusive, leaving the cursor where  it  is,  this  should  be
+       given  as  el1.  If the terminal can clear from the current position to
+       the end of the display, then this should be given as ed.   Ed  is  only
        defined from the first column of a line.  (Thus, it can be simulated by
-       a  request  to  delete  a  large  number  of lines, if a true ed is not
+       a request to delete a large number of  lines,  if  a  true  ed  is  not
        available.)

Insert/delete line and vertical motions

-       If the terminal can open a new blank line before  the  line  where  the
-       cursor  is,  this  should  be  given as il1; this is done only from the
-       first position of a line.  The cursor must then  appear  on  the  newly
-       blank  line.   If  the terminal can delete the line which the cursor is
-       on, then this should be given as dl1; this is done only from the  first
+       If  the  terminal  can  open a new blank line before the line where the
+       cursor is, this should be given as il1; this  is  done  only  from  the
+       first  position  of  a  line.  The cursor must then appear on the newly
+       blank line.  If the terminal can delete the line which  the  cursor  is
+       on,  then this should be given as dl1; this is done only from the first
        position on the line to be deleted.  Versions of il1 and dl1 which take
        a single parameter and insert or delete that many lines can be given as
        il and dl.
 
-       If  the  terminal  has a settable scrolling region (like the vt100) the
-       command to set this can be described with  the  csr  capability,  which
+       If the terminal has a settable scrolling region (like  the  vt100)  the
+       command  to  set  this  can be described with the csr capability, which
        takes two parameters: the top and bottom lines of the scrolling region.
        The cursor position is, alas, undefined after using this command.
 
-       It is possible to get the effect of insert or delete line using csr  on
-       a  properly  chosen  region;  the  sc  and rc (save and restore cursor)
+       It  is possible to get the effect of insert or delete line using csr on
+       a properly chosen region; the sc  and  rc  (save  and  restore  cursor)
        commands may be useful for ensuring that your synthesized insert/delete
-       string  does  not  move the cursor.  (Note that the ncurses(3x) library
-       does  this  synthesis  automatically,   so   you   need   not   compose
+       string does not move the cursor.  (Note that  the  ncurses(3x)  library
+       does   this   synthesis   automatically,   so   you  need  not  compose
        insert/delete strings for an entry with csr).
 
-       Yet  another  way  to  construct  insert  and  delete might be to use a
-       combination of  index  with  the  memory-lock  feature  found  on  some
-       terminals   (like   the   HP-700/90  series,  which  however  also  has
+       Yet another way to construct insert  and  delete  might  be  to  use  a
+       combination  of  index  with  the  memory-lock  feature  found  on some
+       terminals  (like  the  HP-700/90  series,  which   however   also   has
        insert/delete).
 
-       Inserting lines at the top or bottom of the screen  can  also  be  done
-       using  ri  or  ind on many terminals without a true insert/delete line,
+       Inserting  lines  at  the  top or bottom of the screen can also be done
+       using ri or ind on many terminals without a  true  insert/delete  line,
        and is often faster even on terminals with those features.
 
-       The boolean non_dest_scroll_region should  be  set  if  each  scrolling
-       window  is  effectively  a view port on a screen-sized canvas.  To test
-       for this capability, create a scrolling region in  the  middle  of  the
-       screen,  write something to the bottom line, move the cursor to the top
-       of the region, and do ri followed by dl1 or ind.  If the data  scrolled
-       off  the  bottom  of the region by the ri re-appears, then scrolling is
-       non-destructive.  System V and XSI Curses expect that  ind,  ri,  indn,
+       The  boolean  non_dest_scroll_region  should  be  set if each scrolling
+       window is effectively a view port on a screen-sized  canvas.   To  test
+       for  this  capability,  create  a scrolling region in the middle of the
+       screen, write something to the bottom line, move the cursor to the  top
+       of  the region, and do ri followed by dl1 or ind.  If the data scrolled
+       off the bottom of the region by the ri re-appears,  then  scrolling  is
+       non-destructive.   System  V  and XSI Curses expect that ind, ri, indn,
        and  rin  will  simulate  destructive  scrolling;  their  documentation
-       cautions you not to define  csr  unless  this  is  true.   This  curses
-       implementation  is  more  liberal  and  will  do  explicit erases after
+       cautions  you  not  to  define  csr  unless  this is true.  This curses
+       implementation is more  liberal  and  will  do  explicit  erases  after
        scrolling if ndsrc is defined.
 
-       If the terminal has the ability to define a window as part  of  memory,
-       which  all  commands  affect,  it  should be given as the parameterized
-       string wind.  The four parameters are the starting and ending lines  in
+       If  the  terminal has the ability to define a window as part of memory,
+       which all commands affect, it should  be  given  as  the  parameterized
+       string  wind.  The four parameters are the starting and ending lines in
        memory and the starting and ending columns in memory, in that order.
 
        If the terminal can retain display memory above, then the da capability
-       should be given; if display memory  can  be  retained  below,  then  db
-       should  be given.  These indicate that deleting a line or scrolling may
-       bring non-blank lines up from below or that scrolling back with ri  may
+       should  be  given;  if  display  memory  can be retained below, then db
+       should be given.  These indicate that deleting a line or scrolling  may
+       bring  non-blank lines up from below or that scrolling back with ri may
        bring down non-blank lines.

Insert/Delete Character

-       There  are  two  basic  kinds  of intelligent terminals with respect to
-       insert/delete character which can be  described  using  terminfo.   The
-       most   common   insert/delete  character  operations  affect  only  the
-       characters on the current line and shift characters off the end of  the
-       line  rigidly.  Other terminals, such as the Concept 100 and the Perkin
-       Elmer Owl, make a distinction between typed and untyped blanks  on  the
-       screen,  shifting  upon an insert or delete only to an untyped blank on
-       the screen which is either  eliminated,  or  expanded  to  two  untyped
+       There are two basic kinds of  intelligent  terminals  with  respect  to
+       insert/delete  character  which  can  be described using terminfo.  The
+       most  common  insert/delete  character  operations  affect   only   the
+       characters  on the current line and shift characters off the end of the
+       line rigidly.  Other terminals, such as the Concept 100 and the  Perkin
+       Elmer  Owl,  make a distinction between typed and untyped blanks on the
+       screen, shifting upon an insert or delete only to an untyped  blank  on
+       the  screen  which  is  either  eliminated,  or expanded to two untyped
        blanks.
 
-       You  can determine the kind of terminal you have by clearing the screen
-       and then typing text separated by cursor  motions.   Type  "abc    def"
-       using  local  cursor  motions  (not  spaces)  between the "abc" and the
-       "def".  Then position the cursor before the "abc" and put the  terminal
-       in  insert  mode.   If typing characters causes the rest of the line to
-       shift rigidly and characters to fall off the end,  then  your  terminal
-       does  not  distinguish  between  blanks  and untyped positions.  If the
-       "abc" shifts over to the "def" which then move together around the  end
-       of  the  current  line  and  onto  the next as you insert, you have the
-       second type of terminal, and  should  give  the  capability  in,  which
+       You can determine the kind of terminal you have by clearing the  screen
+       and  then  typing  text separated by cursor motions.  Type "abc    def"
+       using local cursor motions (not  spaces)  between  the  "abc"  and  the
+       "def".   Then position the cursor before the "abc" and put the terminal
+       in insert mode.  If typing characters causes the rest of  the  line  to
+       shift  rigidly  and  characters to fall off the end, then your terminal
+       does not distinguish between blanks  and  untyped  positions.   If  the
+       "abc"  shifts over to the "def" which then move together around the end
+       of the current line and onto the next  as  you  insert,  you  have  the
+       second  type  of  terminal,  and  should  give the capability in, which
        stands for "insert null".
 
-       While  these  are  two  logically  separate attributes (one line versus
-       multi-line insert mode, and special treatment  of  untyped  spaces)  we
-       have  seen  no terminals whose insert mode cannot be described with the
+       While these are two logically  separate  attributes  (one  line  versus
+       multi-line  insert  mode,  and  special treatment of untyped spaces) we
+       have seen no terminals whose insert mode cannot be described  with  the
        single attribute.
 
-       Terminfo can describe both terminals which have  an  insert  mode,  and
-       terminals  which send a simple sequence to open a blank position on the
+       Terminfo  can  describe  both  terminals which have an insert mode, and
+       terminals which send a simple sequence to open a blank position on  the
        current line.  Give as smir the sequence to get into insert mode.  Give
-       as  rmir  the  sequence  to  leave  insert  mode.  Now give as ich1 any
-       sequence needed to be sent just before  sending  the  character  to  be
-       inserted.   Most  terminals with a true insert mode will not give ich1;
-       terminals which send a sequence to open a screen position  should  give
+       as rmir the sequence to leave  insert  mode.   Now  give  as  ich1  any
+       sequence  needed  to  be  sent  just before sending the character to be
+       inserted.  Most terminals with a true insert mode will not  give  ich1;
+       terminals  which  send a sequence to open a screen position should give
        it here.
 
-       If  your  terminal has both, insert mode is usually preferable to ich1.
-       Technically, you should not give  both  unless  the  terminal  actually
-       requires  both to be used in combination.  Accordingly, some non-curses
-       applications get confused if both are present; the symptom  is  doubled
-       characters  in  an  update using insert.  This requirement is now rare;
-       most ich sequences do not require previous smir, and most  smir  insert
-       modes  do  not  require ich1 before each character.  Therefore, the new
-       curses actually assumes this is the case and uses either  rmir/smir  or
-       ich/ich1  as appropriate (but not both).  If you have to write an entry
-       to be used under new curses for a terminal old  enough  to  need  both,
+       If your terminal has both, insert mode is usually preferable  to  ich1.
+       Technically,  you  should  not  give  both unless the terminal actually
+       requires both to be used in combination.  Accordingly, some  non-curses
+       applications  get  confused if both are present; the symptom is doubled
+       characters in an update using insert.  This requirement  is  now  rare;
+       most  ich  sequences do not require previous smir, and most smir insert
+       modes do not require ich1 before each character.   Therefore,  the  new
+       curses  actually  assumes this is the case and uses either rmir/smir or
+       ich/ich1 as appropriate (but not both).  If you have to write an  entry
+       to  be  used  under  new curses for a terminal old enough to need both,
        include the rmir/smir sequences in ich1.
 
        If post insert padding is needed, give this as a number of milliseconds
-       in ip (a string option).  Any other sequence which may need to be  sent
+       in  ip (a string option).  Any other sequence which may need to be sent
        after an insert of a single character may also be given in ip.  If your
-       terminal needs both to be placed into an "insert mode"  and  a  special
-       code  to  precede each inserted character, then both smir/rmir and ich1
-       can be given, and both will be used.   The  ich  capability,  with  one
+       terminal  needs  both  to be placed into an "insert mode" and a special
+       code to precede each inserted character, then both smir/rmir  and  ich1
+       can  be  given,  and  both  will be used.  The ich capability, with one
        parameter, n, will repeat the effects of ich1 n times.
 
-       If  padding  is  necessary between characters typed while not in insert
+       If padding is necessary between characters typed while  not  in  insert
        mode, give this as a number of milliseconds padding in rmp.
 
-       It is occasionally necessary to move around while  in  insert  mode  to
-       delete  characters  on the same line (e.g., if there is a tab after the
-       insertion position).  If your terminal allows motion  while  in  insert
-       mode  you  can  give  the  capability mir to speed up inserting in this
-       case.  Omitting mir will affect only speed.   Some  terminals  (notably
-       Datamedia's)  must  not  have  mir because of the way their insert mode
+       It  is  occasionally  necessary  to move around while in insert mode to
+       delete characters on the same line (e.g., if there is a tab  after  the
+       insertion  position).   If  your terminal allows motion while in insert
+       mode you can give the capability mir to  speed  up  inserting  in  this
+       case.   Omitting  mir  will affect only speed.  Some terminals (notably
+       Datamedia's) must not have mir because of the  way  their  insert  mode
        works.
 
-       Finally, you can specify dch1 to delete a single  character,  dch  with
-       one  parameter,  n,  to  delete n characters, and delete mode by giving
-       smdc and rmdc to enter and exit delete  mode  (any  mode  the  terminal
+       Finally,  you  can  specify dch1 to delete a single character, dch with
+       one parameter, n, to delete n characters, and  delete  mode  by  giving
+       smdc  and  rmdc  to  enter  and exit delete mode (any mode the terminal
        needs to be placed in for dch1 to work).
 
-       A  command  to  erase  n  characters (equivalent to outputting n blanks
+       A command to erase n characters  (equivalent  to  outputting  n  blanks
        without moving the cursor) can be given as ech with one parameter.

Highlighting, Underlining, and Visible Bells

        If your terminal has one or more kinds of display attributes, these can
-       be  represented  in  a number of different ways.  You should choose one
-       display form as standout mode,  representing  a  good,  high  contrast,
-       easy-on-the-eyes,  format  for  highlighting  error  messages and other
-       attention getters.  (If you have a choice,  reverse  video  plus  half-
-       bright  is  good,  or reverse video alone.)  The sequences to enter and
-       exit standout mode are given as smso and rmso,  respectively.   If  the
-       code  to  change  into  or  out of standout mode leaves one or even two
-       blank spaces on the screen, as the TVI 912 and Teleray  1061  do,  then
+       be represented in a number of different ways.  You  should  choose  one
+       display  form  as  standout  mode,  representing a good, high contrast,
+       easy-on-the-eyes, format for  highlighting  error  messages  and  other
+       attention  getters.   (If  you  have a choice, reverse video plus half-
+       bright is good, or reverse video alone.)  The sequences  to  enter  and
+       exit  standout  mode  are given as smso and rmso, respectively.  If the
+       code to change into or out of standout mode  leaves  one  or  even  two
+       blank  spaces  on  the screen, as the TVI 912 and Teleray 1061 do, then
        xmc should be given to tell how many spaces are left.
 
        Codes to begin underlining and end underlining can be given as smul and
        rmul respectively.  If the terminal has a code to underline the current
-       character  and  move  the  cursor  one  space to the right, such as the
+       character and move the cursor one space  to  the  right,  such  as  the
        Microterm Mime, this can be given as uc.
 
-       Other capabilities to enter various highlighting  modes  include  blink
-       (blinking)  bold  (bold or extra bright) dim (dim or half-bright) invis
-       (blanking or invisible text) prot (protected) rev (reverse video)  sgr0
-       (turn  off  all  attribute  modes) smacs (enter alternate character set
+       Other  capabilities  to  enter various highlighting modes include blink
+       (blinking) bold (bold or extra bright) dim (dim or  half-bright)  invis
+       (blanking  or invisible text) prot (protected) rev (reverse video) sgr0
+       (turn off all attribute modes) smacs  (enter  alternate  character  set
        mode) and rmacs (exit alternate character set mode).  Turning on any of
        these modes singly may or may not turn off other modes.
 
-       If  there  is  a  sequence to set arbitrary combinations of modes, this
-       should be given as sgr (set attributes),  taking  9  parameters.   Each
-       parameter  is either 0 or nonzero, as the corresponding attribute is on
-       or off.  The 9 parameters are, in order: standout, underline,  reverse,
-       blink,  dim,  bold,  blank,  protect, alternate character set.  Not all
-       modes need be supported by sgr,  only  those  for  which  corresponding
+       If there is a sequence to set arbitrary  combinations  of  modes,  this
+       should  be  given  as  sgr (set attributes), taking 9 parameters.  Each
+       parameter is either 0 or nonzero, as the corresponding attribute is  on
+       or  off.  The 9 parameters are, in order: standout, underline, reverse,
+       blink, dim, bold, blank, protect, alternate  character  set.   Not  all
+       modes  need  be  supported  by  sgr, only those for which corresponding
        separate attribute commands exist.
 
        For example, the DEC vt220 supports most of the modes:
@@ -1903,17 +1908,17 @@
                p8                   protect          not used
                p9                   altcharset       ^O (off) ^N (on)
 
-       We  begin each escape sequence by turning off any existing modes, since
-       there is no quick way to determine whether they are  active.   Standout
-       is  set  up  to  be  the  combination  of  reverse and bold.  The vt220
-       terminal has a protect mode, though it is  not  commonly  used  in  sgr
-       because  it protects characters on the screen from the host's erasures.
-       The altcharset mode also is different in that it is either  ^O  or  ^N,
-       depending  on whether it is off or on.  If all modes are turned on, the
+       We begin each escape sequence by turning off any existing modes,  since
+       there  is  no quick way to determine whether they are active.  Standout
+       is set up to be  the  combination  of  reverse  and  bold.   The  vt220
+       terminal  has  a  protect  mode,  though it is not commonly used in sgr
+       because it protects characters on the screen from the host's  erasures.
+       The  altcharset  mode  also is different in that it is either ^O or ^N,
+       depending on whether it is off or on.  If all modes are turned on,  the
        resulting sequence is \E[0;1;4;5;7;8m^N.
 
-       Some sequences are common to  different  modes.   For  example,  ;7  is
-       output  when  either  p1  or p3 is true, that is, if either standout or
+       Some  sequences  are  common  to  different  modes.  For example, ;7 is
+       output when either p1 or p3 is true, that is,  if  either  standout  or
        reverse modes are turned on.
 
        Writing out the above sequences, along with their dependencies yields
@@ -1934,54 +1939,54 @@
            sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p4%t;5%;
                %?%p1%p3%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
 
-       Remember that if you specify sgr, you must also  specify  sgr0.   Also,
-       some  implementations  rely  on  sgr  being  given  if sgr0 is, Not all
+       Remember  that  if  you specify sgr, you must also specify sgr0.  Also,
+       some implementations rely on sgr  being  given  if  sgr0  is,  Not  all
        terminfo  entries  necessarily  have  an  sgr  string,  however.   Many
-       terminfo  entries  are  derived  from termcap entries which have no sgr
+       terminfo entries are derived from termcap entries  which  have  no  sgr
        string.  The only drawback to adding an sgr string is that termcap also
        assumes that sgr0 does not exit alternate character set mode.
 
-       Terminals   with  the  "magic  cookie"  glitch  (xmc)  deposit  special
-       "cookies" when they receive mode-setting sequences,  which  affect  the
-       display  algorithm  rather  than  having extra bits for each character.
-       Some terminals, such as the HP 2621, automatically leave standout  mode
-       when  they  move  to  a  new line or the cursor is addressed.  Programs
-       using standout mode should exit standout mode before moving the  cursor
-       or  sending a newline, unless the msgr capability, asserting that it is
+       Terminals  with  the  "magic  cookie"  glitch  (xmc)  deposit   special
+       "cookies"  when  they  receive mode-setting sequences, which affect the
+       display algorithm rather than having extra  bits  for  each  character.
+       Some  terminals, such as the HP 2621, automatically leave standout mode
+       when they move to a new line or  the  cursor  is  addressed.   Programs
+       using  standout mode should exit standout mode before moving the cursor
+       or sending a newline, unless the msgr capability, asserting that it  is
        safe to move in standout mode, is present.
 
-       If the terminal has a way of flashing the screen to indicate  an  error
-       quietly  (a  bell replacement) then this can be given as flash; it must
+       If  the  terminal has a way of flashing the screen to indicate an error
+       quietly (a bell replacement) then this can be given as flash;  it  must
        not move the cursor.
 
-       If the cursor needs to be made more visible than normal when it is  not
+       If  the cursor needs to be made more visible than normal when it is not
        on the bottom line (to make, for example, a non-blinking underline into
-       an easier to find block or blinking underline) give  this  sequence  as
+       an  easier  to  find block or blinking underline) give this sequence as
        cvvis.  If there is a way to make the cursor completely invisible, give
-       that as civis.  The capability cnorm should be given which  undoes  the
+       that  as  civis.  The capability cnorm should be given which undoes the
        effects of both of these modes.
 
-       If  your  terminal  correctly  generates underlined characters (with no
-       special codes needed) even though it  does  not  overstrike,  then  you
-       should  give  the  capability  ul.  If a character overstriking another
-       leaves both characters on the screen, specify the  capability  os.   If
+       If your terminal correctly generates  underlined  characters  (with  no
+       special  codes  needed)  even  though  it does not overstrike, then you
+       should give the capability ul.  If  a  character  overstriking  another
+       leaves  both  characters  on the screen, specify the capability os.  If
        overstrikes are erasable with a blank, then this should be indicated by
        giving eo.

Keypad and Function Keys

-       If the terminal has a keypad that transmits codes  when  the  keys  are
-       pressed,  this  information can be given.  Note that it is not possible
+       If  the  terminal  has  a keypad that transmits codes when the keys are
+       pressed, this information can be given.  Note that it is  not  possible
        to handle terminals where the keypad only works in local (this applies,
-       for  example, to the unshifted HP 2621 keys).  If the keypad can be set
-       to transmit or not  transmit,  give  these  codes  as  smkx  and  rmkx.
+       for example, to the unshifted HP 2621 keys).  If the keypad can be  set
+       to  transmit  or  not  transmit,  give  these  codes  as smkx and rmkx.
        Otherwise the keypad is assumed to always transmit.
 
-       The  codes  sent  by the left arrow, right arrow, up arrow, down arrow,
-       and home keys can be given as kcub1, kcuf1,  kcuu1,  kcud1,  and  khome
+       The codes sent by the left arrow, right arrow, up  arrow,  down  arrow,
+       and  home  keys  can  be given as kcub1, kcuf1, kcuu1, kcud1, and khome
        respectively.  If there are function keys such as f0, f1, ..., f10, the
-       codes they send can be given as kf0, kf1, ...,  kf10.   If  these  keys
-       have  labels  other  than the default f0 through f10, the labels can be
+       codes  they  send  can  be given as kf0, kf1, ..., kf10.  If these keys
+       have labels other than the default f0 through f10, the  labels  can  be
        given as lf0, lf1, ..., lf10.
 
        The codes transmitted by certain other special keys can be given:
@@ -2020,64 +2025,64 @@
 
        o   khts (set a tab stop in this column).
 
-       In addition, if the keypad has a 3 by 3 array  of  keys  including  the
-       four  arrow  keys,  the  other five keys can be given as ka1, ka3, kb2,
-       kc1, and kc3.  These keys are useful when the  effects  of  a  3  by  3
+       In  addition,  if  the  keypad has a 3 by 3 array of keys including the
+       four arrow keys, the other five keys can be given  as  ka1,  ka3,  kb2,
+       kc1,  and  kc3.   These  keys  are  useful when the effects of a 3 by 3
        directional pad are needed.
 
        Strings to program function keys can be given as pfkey, pfloc, and pfx.
-       A string to program screen labels should be specified as pln.  Each  of
-       these  strings takes two parameters: the function key number to program
+       A  string to program screen labels should be specified as pln.  Each of
+       these strings takes two parameters: the function key number to  program
        (from 0 to 10) and the string to program it with.  Function key numbers
-       out  of  this  range may program undefined keys in a terminal dependent
-       manner.  The difference between the capabilities is that  pfkey  causes
-       pressing  the  given  key  to  be the same as the user typing the given
-       string; pfloc causes the string to  be  executed  by  the  terminal  in
+       out of this range may program undefined keys in  a  terminal  dependent
+       manner.   The  difference between the capabilities is that pfkey causes
+       pressing the given key to be the same as  the  user  typing  the  given
+       string;  pfloc  causes  the  string  to  be executed by the terminal in
        local; and pfx causes the string to be transmitted to the computer.
 
-       The  capabilities  nlab,  lw  and  lh define the number of programmable
-       screen labels and their width and height.  If  there  are  commands  to
-       turn  the  labels  on  and  off,  give  them in smln and rmln.  smln is
-       normally output after one or more pln sequences to make sure  that  the
+       The capabilities nlab, lw and lh  define  the  number  of  programmable
+       screen  labels  and  their  width and height.  If there are commands to
+       turn the labels on and off, give  them  in  smln  and  rmln.   smln  is
+       normally  output  after one or more pln sequences to make sure that the
        change becomes visible.

Tabs and Initialization

        A few capabilities are used only for tabs:
 
-       o   If  the  terminal  has hardware tabs, the command to advance to the
+       o   If the terminal has hardware tabs, the command to  advance  to  the
            next tab stop can be given as ht (usually control/I).
 
        o   A "back-tab" command which moves leftward to the preceding tab stop
            can be given as cbt.
 
-           By  convention,  if the teletype modes indicate that tabs are being
-           expanded by the computer rather than being sent  to  the  terminal,
-           programs  should  not use ht or cbt even if they are present, since
+           By convention, if the teletype modes indicate that tabs  are  being
+           expanded  by  the  computer rather than being sent to the terminal,
+           programs should not use ht or cbt even if they are  present,  since
            the user may not have the tab stops properly set.
 
-       o   If the terminal has hardware tabs which are initially set  every  n
+       o   If  the  terminal has hardware tabs which are initially set every n
            spaces when the terminal is powered up, the numeric parameter it is
            given, showing the number of spaces the tabs are set to.
 
            The it capability is normally used by the tset command to determine
-           whether  to set the mode for hardware tab expansion, and whether to
+           whether to set the mode for hardware tab expansion, and whether  to
            set the tab stops.  If the terminal has tab stops that can be saved
-           in  non-volatile  memory,  the terminfo description can assume that
+           in non-volatile memory, the terminfo description  can  assume  that
            they are properly set.
 
        Other capabilities include
 
        o   is1, is2, and is3, initialization strings for the terminal,
 
-       o   iprog, the path name of a program  to  be  run  to  initialize  the
+       o   iprog,  the  path  name  of  a  program to be run to initialize the
            terminal,
 
        o   and if, the name of a file containing long initialization strings.
 
-       These  strings  are  expected to set the terminal into modes consistent
-       with the rest of the terminfo description.  They are normally  sent  to
-       the  terminal,  by  the  init option of the tput program, each time the
+       These strings are expected to set the terminal  into  modes  consistent
+       with  the  rest of the terminfo description.  They are normally sent to
+       the terminal, by the init option of the tput  program,  each  time  the
        user logs in.  They will be printed in the following order:
 
               run the program
@@ -2101,34 +2106,34 @@
               and finally output
                      is3.
 
-       Most initialization is done with is2.  Special terminal  modes  can  be
-       set  up  without duplicating strings by putting the common sequences in
+       Most  initialization  is  done with is2.  Special terminal modes can be
+       set up without duplicating strings by putting the common  sequences  in
        is2 and special cases in is1 and is3.
 
-       A set of sequences that does a harder  reset  from  a  totally  unknown
+       A  set  of  sequences  that  does a harder reset from a totally unknown
        state can be given as rs1, rs2, rf and rs3, analogous to is1 , is2 , if
-       and is3 respectively.  These strings are  output  by  reset  option  of
-       tput,  or  by  the reset program (an alias of tset), which is used when
+       and  is3  respectively.   These  strings  are output by reset option of
+       tput, or by the reset program (an alias of tset), which  is  used  when
        the terminal gets into a wedged state.  Commands are normally placed in
        rs1, rs2 rs3 and rf only if they produce annoying effects on the screen
        and are not necessary when logging in.  For example, the command to set
-       the  vt100  into  80-column  mode would normally be part of is2, but it
-       causes an annoying glitch of the screen  and  is  not  normally  needed
+       the vt100 into 80-column mode would normally be part  of  is2,  but  it
+       causes  an  annoying  glitch  of  the screen and is not normally needed
        since the terminal is usually already in 80-column mode.
 
-       The  reset  program  writes  strings including iprog, etc., in the same
-       order as the init program, using rs1, etc., instead of  is1,  etc.   If
-       any  of  rs1, rs2, rs3, or rf reset capability strings are missing, the
-       reset  program  falls  back  upon  the   corresponding   initialization
+       The reset program writes strings including iprog,  etc.,  in  the  same
+       order  as  the  init program, using rs1, etc., instead of is1, etc.  If
+       any of rs1, rs2, rs3, or rf reset capability strings are  missing,  the
+       reset   program   falls  back  upon  the  corresponding  initialization
        capability string.
 
-       If  there are commands to set and clear tab stops, they can be given as
+       If there are commands to set and clear tab stops, they can be given  as
        tbc (clear all tab stops) and hts (set a tab stop in the current column
-       of  every  row).   If a more complex sequence is needed to set the tabs
+       of every row).  If a more complex sequence is needed to  set  the  tabs
        than can be described by this, the sequence can be placed in is2 or if.
 
-       The tput reset command uses the same capability strings  as  the  reset
-       command,  although  the two programs (tput and reset) provide different
+       The  tput  reset  command uses the same capability strings as the reset
+       command, although the two programs (tput and reset)  provide  different
        command-line options.
 
        In  practice,  these  terminfo  capabilities  are  not  often  used  in
@@ -2137,78 +2142,78 @@
        o   Almost all hardware terminals (at least those which supported tabs)
            initialized those to every eight columns:
 
-           The only exception was the AT&T 2300  series,  which  set  tabs  to
+           The  only  exception  was  the  AT&T 2300 series, which set tabs to
            every five columns.
 
-       o   In  particular,  developers  of  the  hardware  terminals which are
-           commonly used as models  for  modern  terminal  emulators  provided
+       o   In particular, developers  of  the  hardware  terminals  which  are
+           commonly  used  as  models  for  modern terminal emulators provided
            documentation demonstrating that eight columns were the standard.
 
        o   Because of this, the terminal initialization programs tput and tset
-           use  the  tbc  (clear_all_tabs)  and  hts  (set_tab)   capabilities
-           directly  only when the it (init_tabs) capability is set to a value
+           use   the  tbc  (clear_all_tabs)  and  hts  (set_tab)  capabilities
+           directly only when the it (init_tabs) capability is set to a  value
            other than eight.

Delays and Padding

-       Many older and slower terminals do not support either XON/XOFF  or  DTR
-       handshaking,  including  hard copy terminals and some very archaic CRTs
-       (including, for  example,  DEC  VT100s).   These  may  require  padding
+       Many  older  and slower terminals do not support either XON/XOFF or DTR
+       handshaking, including hard copy terminals and some very  archaic  CRTs
+       (including,  for  example,  DEC  VT100s).   These  may  require padding
        characters after certain cursor motions and screen changes.
 
        If the terminal uses xon/xoff handshaking for flow control (that is, it
-       automatically emits ^S back to the host  when  its  input  buffers  are
-       close  to  full),  set xon.  This capability suppresses the emission of
-       padding.  You  can  also  set  it  for  memory-mapped  console  devices
+       automatically  emits  ^S  back  to  the host when its input buffers are
+       close to full), set xon.  This capability suppresses  the  emission  of
+       padding.   You  can  also  set  it  for  memory-mapped  console devices
        effectively that do not have a speed limit.  Padding information should
-       still be included so that routines  can  make  better  decisions  about
+       still  be  included  so  that  routines can make better decisions about
        relative costs, but actual pad characters will not be transmitted.
 
        If pb (padding baud rate) is given, padding is suppressed at baud rates
-       below the value of pb.  If the entry has no  padding  baud  rate,  then
+       below  the  value  of  pb.  If the entry has no padding baud rate, then
        whether padding is emitted or not is completely controlled by xon.
 
-       If  the  terminal requires other than a null (zero) character as a pad,
-       then this can be given as pad.  Only the first  character  of  the  pad
+       If the terminal requires other than a null (zero) character as  a  pad,
+       then  this  can  be  given as pad.  Only the first character of the pad
        string is used.

Status Lines

-       Some  terminals  have an extra "status line" which is not normally used
+       Some terminals have an extra "status line" which is not  normally  used
        by software (and thus not counted in the terminal's lines capability).
 
-       The simplest case is a status line which is cursor-addressable but  not
+       The  simplest case is a status line which is cursor-addressable but not
        part of the main scrolling region on the screen; the Heathkit H19 has a
-       status line of this kind, as would  a  24-line  VT100  with  a  23-line
+       status  line  of  this  kind,  as  would a 24-line VT100 with a 23-line
        scrolling region set up on initialization.  This situation is indicated
        by the hs capability.
 
-       Some terminals with status lines need special sequences to  access  the
-       status  line.  These may be expressed as a string with single parameter
-       tsl which takes the cursor to a given zero-origin column on the  status
-       line.   The  capability  fsl  must  return  to  the  main-screen cursor
+       Some  terminals  with status lines need special sequences to access the
+       status line.  These may be expressed as a string with single  parameter
+       tsl  which takes the cursor to a given zero-origin column on the status
+       line.  The  capability  fsl  must  return  to  the  main-screen  cursor
        positions before the last tsl.  You may need to embed the string values
-       of  sc  (save  cursor)  and  rc  (restore  cursor)  in  tsl  and fsl to
+       of sc (save  cursor)  and  rc  (restore  cursor)  in  tsl  and  fsl  to
        accomplish this.
 
-       The status line is normally assumed to be the same width as  the  width
-       of  the  terminal.   If  this  is  untrue,  you can specify it with the
+       The  status  line is normally assumed to be the same width as the width
+       of the terminal.  If this is  untrue,  you  can  specify  it  with  the
        numeric capability wsl.
 
        A command to erase or blank the status line may be specified as dsl.
 
-       The boolean capability eslok specifies  that  escape  sequences,  tabs,
+       The  boolean  capability  eslok  specifies that escape sequences, tabs,
        etc., work ordinarily in the status line.
 
-       The  ncurses implementation does not yet use any of these capabilities.
+       The ncurses implementation does not yet use any of these  capabilities.
        They are documented here in case they ever become important.

Line Graphics

-       Many terminals have alternate character sets useful for  forms-drawing.
-       Terminfo  and  curses  have  built-in  support  for most of the drawing
-       characters supported by the VT100, with some characters from  the  AT&T
-       4410v1  added.   This  alternate  character set may be specified by the
+       Many  terminals have alternate character sets useful for forms-drawing.
+       Terminfo and curses have built-in  support  for  most  of  the  drawing
+       characters  supported  by the VT100, with some characters from the AT&T
+       4410v1 added.  This alternate character set may  be  specified  by  the
        acsc capability.
 
          Glyph                       ACS            Ascii     acsc     acsc
@@ -2216,6 +2221,7 @@
          --------------------------------------------------------------------
          arrow pointing right        ACS_RARROW     >         +        0x2b
          arrow pointing left         ACS_LARROW     <         ,        0x2c
+
          arrow pointing up           ACS_UARROW     ^         -        0x2d
          arrow pointing down         ACS_DARROW     v         .        0x2e
          solid square block          ACS_BLOCK      #         0        0x30
@@ -2226,7 +2232,6 @@
          board of squares            ACS_BOARD      #         h        0x68
          lantern symbol              ACS_LANTERN    #         i        0x69
          lower right corner          ACS_LRCORNER   +         j        0x6a
-
          upper right corner          ACS_URCORNER   +         k        0x6b
          upper left corner           ACS_ULCORNER   +         l        0x6c
          lower left corner           ACS_LLCORNER   +         m        0x6d
@@ -2250,34 +2255,34 @@
 
        A few notes apply to the table itself:
 
-       o   X/Open Curses incorrectly states that the mapping  for  lantern  is
-           uppercase  "I"  although Unix implementations use the lowercase "i"
+       o   X/Open  Curses  incorrectly  states that the mapping for lantern is
+           uppercase "I" although Unix implementations use the  lowercase  "i"
            mapping.
 
-       o   The DEC VT100 implemented graphics using  the  alternate  character
-           set  feature, temporarily switching modes and sending characters in
-           the range 0x60 (96) to 0x7e (126) (the acsc  Value  column  in  the
+       o   The  DEC  VT100  implemented graphics using the alternate character
+           set feature, temporarily switching modes and sending characters  in
+           the  range  0x60  (96)  to 0x7e (126) (the acsc Value column in the
            table).
 
        o   The AT&T terminal added graphics characters outside that range.
 
-           Some  of  the  characters  within the range do not match the VT100;
-           presumably they were used in the AT&T terminal:  board  of  squares
-           replaces  the  VT100  newline symbol, while lantern symbol replaces
+           Some of the characters within the range do  not  match  the  VT100;
+           presumably  they  were  used in the AT&T terminal: board of squares
+           replaces the VT100 newline symbol, while  lantern  symbol  replaces
            the VT100 vertical tab symbol.  The other VT100 symbols for control
-           characters  (horizontal tab, carriage return and line-feed) are not
+           characters (horizontal tab, carriage return and line-feed) are  not
            (re)used in curses.
 
-       The best way to define a new device's graphics set is to add  a  column
-       to  a  copy of this table for your terminal, giving the character which
-       (when emitted between smacs/rmacs switches) will  be  rendered  as  the
+       The  best  way to define a new device's graphics set is to add a column
+       to a copy of this table for your terminal, giving the  character  which
+       (when  emitted  between  smacs/rmacs  switches) will be rendered as the
        corresponding graphic.  Then read off the VT100/your terminal character
        pairs right to left in sequence; these become the ACSC string.

Color Handling

-       The curses library functions init_pair and  init_color  manipulate  the
-       color   pairs   and   color  values  discussed  in  this  section  (see
+       The  curses  library  functions init_pair and init_color manipulate the
+       color  pairs  and  color  values  discussed  in   this   section   (see
        curs_color(3x) for details on these and related functions).
 
        Most color terminals are either "Tektronix-like" or "HP-like":
@@ -2286,45 +2291,45 @@
            is usually 8), and can set character-cell foreground and background
            characters independently, mixing them into N * N color-pairs.
 
-       o   On HP-like  terminals,  the  user  must  set  each  color  pair  up
-           separately   (foreground   and  background  are  not  independently
-           settable).  Up to M color-pairs may be set up  from  2*M  different
+       o   On  HP-like  terminals,  the  user  must  set  each  color  pair up
+           separately  (foreground  and  background  are   not   independently
+           settable).   Up  to  M color-pairs may be set up from 2*M different
            colors.  ANSI-compatible terminals are Tektronix-like.
 
        Some basic color capabilities are independent of the color method.  The
-       numeric capabilities colors and pairs specify the  maximum  numbers  of
-       colors  and  color-pairs  that can be displayed simultaneously.  The op
+       numeric  capabilities  colors  and pairs specify the maximum numbers of
+       colors and color-pairs that can be displayed  simultaneously.   The  op
        (original pair) string resets foreground and background colors to their
-       default  values  for  the terminal.  The oc string resets all colors or
-       color-pairs to their default values for the terminal.   Some  terminals
-       (including  many  PC  terminal  emulators)  erase screen areas with the
-       current background color rather than the power-up  default  background;
+       default values for the terminal.  The oc string resets  all  colors  or
+       color-pairs  to  their default values for the terminal.  Some terminals
+       (including many PC terminal emulators)  erase  screen  areas  with  the
+       current  background  color rather than the power-up default background;
        these should have the boolean capability bce.
 
-       While  the  curses  library  works  with  color  pairs  (reflecting the
-       inability of some devices  to  set  foreground  and  background  colors
-       independently),  there  are  separate  capabilities  for  setting these
+       While the  curses  library  works  with  color  pairs  (reflecting  the
+       inability  of  some  devices  to  set  foreground and background colors
+       independently), there  are  separate  capabilities  for  setting  these
        features:
 
-       o   To  change  the  current  foreground  or  background  color  on   a
-           Tektronix-type  terminal, use setaf (set ANSI foreground) and setab
-           (set ANSI background)  or  setf  (set  foreground)  and  setb  (set
+       o   To   change  the  current  foreground  or  background  color  on  a
+           Tektronix-type terminal, use setaf (set ANSI foreground) and  setab
+           (set  ANSI  background)  or  setf  (set  foreground)  and setb (set
            background).  These take one parameter, the color number.  The SVr4
-           documentation describes only setaf/setab; the XPG4 draft says  that
-           "If  the  terminal supports ANSI escape sequences to set background
-           and  foreground,  they  should  be  coded  as  setaf   and   setab,
+           documentation  describes only setaf/setab; the XPG4 draft says that
+           "If the terminal supports ANSI escape sequences to  set  background
+           and   foreground,   they  should  be  coded  as  setaf  and  setab,
            respectively.
 
-       o   If  the  terminal supports other escape sequences to set background
-           and  foreground,  they  should  be  coded   as   setf   and   setb,
-           respectively.   The  vidputs  and the refresh(3x) functions use the
+       o   If the terminal supports other escape sequences to  set  background
+           and   foreground,   they   should   be  coded  as  setf  and  setb,
+           respectively.  The vidputs and the refresh(3x)  functions  use  the
            setaf and setab capabilities if they are defined.
 
-       The setaf/setab  and  setf/setb  capabilities  take  a  single  numeric
+       The  setaf/setab  and  setf/setb  capabilities  take  a  single numeric
        argument each.  Argument values 0-7 of setaf/setab are portably defined
-       as follows (the middle column is the symbolic #define available in  the
-       header  for the curses or ncurses libraries).  The terminal hardware is
-       free to map these as it likes,  but  the  RGB  values  indicate  normal
+       as  follows (the middle column is the symbolic #define available in the
+       header for the curses or ncurses libraries).  The terminal hardware  is
+       free  to  map  these  as  it  likes, but the RGB values indicate normal
        locations in color space.
 
                     Color       #define       Value       RGB
@@ -2350,32 +2355,32 @@
                     yellow    COLOR_YELLOW      6     max,max,0
                     white     COLOR_WHITE       7     max,max,max
 
-       It is important to not confuse the  two  sets  of  color  capabilities;
+       It  is  important  to  not  confuse the two sets of color capabilities;
        otherwise red/blue will be interchanged on the display.
 
-       On  an  HP-like terminal, use scp with a color-pair number parameter to
+       On an HP-like terminal, use scp with a color-pair number  parameter  to
        set which color pair is current.
 
        Some terminals allow the color values to be modified:
 
-       o   On a Tektronix-like terminal, the capability ccc may be present  to
-           indicate  that colors can be modified.  If so, the initc capability
+       o   On  a Tektronix-like terminal, the capability ccc may be present to
+           indicate that colors can be modified.  If so, the initc  capability
            will take a color number (0 to colors - 1)and three more parameters
-           which  describe the color.  These three parameters default to being
-           interpreted as RGB (Red,  Green,  Blue)  values.   If  the  boolean
+           which describe the color.  These three parameters default to  being
+           interpreted  as  RGB  (Red,  Green,  Blue)  values.  If the boolean
            capability hls is present, they are instead as HLS (Hue, Lightness,
            Saturation) indices.  The ranges are terminal-dependent.
 
-       o   On an HP-like terminal, initp may give a capability for changing  a
-           color-pair  value.   It  will  take  seven parameters; a color-pair
-           number (0 to max_pairs -  1),  and  two  triples  describing  first
-           background  and  then  foreground colors.  These parameters must be
-           (Red, Green, Blue) or (Hue,  Lightness,  Saturation)  depending  on
+       o   On  an HP-like terminal, initp may give a capability for changing a
+           color-pair value.  It will  take  seven  parameters;  a  color-pair
+           number  (0  to  max_pairs  -  1),  and two triples describing first
+           background and then foreground colors.  These  parameters  must  be
+           (Red,  Green,  Blue)  or  (Hue, Lightness, Saturation) depending on
            hls.
 
-       On  some  color  terminals,  colors  collide  with highlights.  You can
-       register these collisions with the ncv capability.  This is a  bit-mask
-       of   attributes   not   to  be  used  when  colors  are  enabled.   The
+       On some color terminals,  colors  collide  with  highlights.   You  can
+       register  these collisions with the ncv capability.  This is a bit-mask
+       of  attributes  not  to  be  used  when  colors   are   enabled.    The
        correspondence with the attributes understood by curses is as follows:
 
                   Attribute              Bit   Decimal      Set by
@@ -2396,134 +2401,134 @@
                   A_VERTICAL             14    16384        sgr1
                   A_ITALIC               15    32768        sitm
 
-       For example, on many IBM PC consoles, the underline attribute  collides
-       with  the  foreground  color  blue  and is not available in color mode.
+       For  example, on many IBM PC consoles, the underline attribute collides
+       with the foreground color blue and is  not  available  in  color  mode.
        These should have an ncv capability of 2.
 
-       SVr4 curses does nothing with ncv, ncurses recognizes it and  optimizes
+       SVr4  curses does nothing with ncv, ncurses recognizes it and optimizes
        the output in favor of colors.

Miscellaneous

-       If  the  terminal requires other than a null (zero) character as a pad,
-       then this can be given as pad.  Only the first  character  of  the  pad
+       If the terminal requires other than a null (zero) character as  a  pad,
+       then  this  can  be  given as pad.  Only the first character of the pad
        string is used.  If the terminal does not have a pad character, specify
-       npc.  Note that ncurses implements the termcap-compatible PC  variable;
-       though  the  application  may  set this value to something other than a
-       null, ncurses will test npc first and use napms if the terminal has  no
+       npc.   Note that ncurses implements the termcap-compatible PC variable;
+       though the application may set this value to  something  other  than  a
+       null,  ncurses will test npc first and use napms if the terminal has no
        pad character.
 
-       If  the terminal can move up or down half a line, this can be indicated
-       with hu (half-line up) and hd  (half-line  down).   This  is  primarily
-       useful  for  superscripts  and subscripts on hard-copy terminals.  If a
+       If the terminal can move up or down half a line, this can be  indicated
+       with  hu  (half-line  up)  and  hd (half-line down).  This is primarily
+       useful for superscripts and subscripts on hard-copy  terminals.   If  a
        hard-copy terminal can eject to the next page (form feed), give this as
        ff (usually control/L).
 
-       If  there  is  a  command to repeat a given character a given number of
-       times  (to  save  time  transmitting  a  large  number   of   identical
-       characters)  this  can  be indicated with the parameterized string rep.
-       The first parameter is the character to be repeated and the  second  is
+       If there is a command to repeat a given character  a  given  number  of
+       times   (to   save  time  transmitting  a  large  number  of  identical
+       characters) this can be indicated with the  parameterized  string  rep.
+       The  first  parameter is the character to be repeated and the second is
        the number of times to repeat it.  Thus, tparm(repeat_char, 'x', 10) is
        the same as "xxxxxxxxxx".
 
        If the terminal has a settable command character, such as the TEKTRONIX
-       4025,  this can be indicated with cmdch.  A prototype command character
-       is chosen which is used in all capabilities.  This character  is  given
-       in  the  cmdch  capability to identify it.  The following convention is
+       4025, this can be indicated with cmdch.  A prototype command  character
+       is  chosen  which is used in all capabilities.  This character is given
+       in the cmdch capability to identify it.  The  following  convention  is
        supported on some UNIX systems: The environment is to be searched for a
-       CC  variable,  and if found, all occurrences of the prototype character
+       CC variable, and if found, all occurrences of the  prototype  character
        are replaced with the character in the environment variable.
 
-       Terminal descriptions that do not represent a specific  kind  of  known
-       terminal,  such  as  switch, dialup, patch, and network, should include
-       the gn (generic) capability so that programs can complain that they  do
-       not  know how to talk to the terminal.  (This capability does not apply
-       to virtual terminal descriptions for which  the  escape  sequences  are
+       Terminal  descriptions  that  do not represent a specific kind of known
+       terminal, such as switch, dialup, patch, and  network,  should  include
+       the  gn (generic) capability so that programs can complain that they do
+       not know how to talk to the terminal.  (This capability does not  apply
+       to  virtual  terminal  descriptions  for which the escape sequences are
        known.)
 
        If the terminal has a "meta key" which acts as a shift key, setting the
-       8th bit of any character transmitted, this fact can be  indicated  with
-       km.   Otherwise, software will assume that the 8th bit is parity and it
-       will usually be cleared.  If strings exist to turn this "meta mode"  on
+       8th  bit  of any character transmitted, this fact can be indicated with
+       km.  Otherwise, software will assume that the 8th bit is parity and  it
+       will  usually be cleared.  If strings exist to turn this "meta mode" on
        and off, they can be given as smm and rmm.
 
        If the terminal has more lines of memory than will fit on the screen at
-       once, the number of lines of memory can be indicated with lm.  A  value
+       once,  the number of lines of memory can be indicated with lm.  A value
        of lm#0 indicates that the number of lines is not fixed, but that there
        is still more memory than fits on the screen.
 
-       If the terminal is one of those supported by the UNIX virtual  terminal
+       If  the terminal is one of those supported by the UNIX virtual terminal
        protocol, the terminal number can be given as vt.
 
-       Media  copy strings which control an auxiliary printer connected to the
-       terminal can be given as mc0: print the contents of  the  screen,  mc4:
-       turn  off  the printer, and mc5: turn on the printer.  When the printer
-       is on, all text sent to the terminal will be sent to the  printer.   It
-       is  undefined whether the text is also displayed on the terminal screen
-       when the printer is on.  A variation  mc5p  takes  one  parameter,  and
-       leaves  the  printer  on  for  as  many  characters as the value of the
+       Media copy strings which control an auxiliary printer connected to  the
+       terminal  can  be  given as mc0: print the contents of the screen, mc4:
+       turn off the printer, and mc5: turn on the printer.  When  the  printer
+       is  on,  all text sent to the terminal will be sent to the printer.  It
+       is undefined whether the text is also displayed on the terminal  screen
+       when  the  printer  is  on.   A variation mc5p takes one parameter, and
+       leaves the printer on for as  many  characters  as  the  value  of  the
        parameter, then turns the printer off.  The parameter should not exceed
-       255.   All  text, including mc4, is transparently passed to the printer
+       255.  All text, including mc4, is transparently passed to  the  printer
        while an mc5p is in effect.

Glitches and Braindamage

-       Hazeltine terminals, which do not allow "~" characters to be  displayed
+       Hazeltine  terminals, which do not allow "~" characters to be displayed
        should indicate hz.
 
-       Terminals  which  ignore a line-feed immediately after an am wrap, such
+       Terminals which ignore a line-feed immediately after an am  wrap,  such
        as the Concept and vt100, should indicate xenl.
 
-       If el is required to get rid of standout  (instead  of  merely  writing
+       If  el  is  required  to get rid of standout (instead of merely writing
        normal text on top of it), xhp should be given.
 
        Teleray terminals, where tabs turn all characters moved over to blanks,
-       should indicate xt (destructive tabs).  Note: the  variable  indicating
-       this   is   now  "dest_tabs_magic_smso";  in  older  versions,  it  was
-       teleray_glitch.  This glitch is also taken  to  mean  that  it  is  not
-       possible  to  position  the  cursor on top of a "magic cookie", that to
-       erase standout mode it is instead necessary to use  delete  and  insert
+       should  indicate  xt (destructive tabs).  Note: the variable indicating
+       this  is  now  "dest_tabs_magic_smso";  in  older  versions,   it   was
+       teleray_glitch.   This  glitch  is  also  taken  to mean that it is not
+       possible to position the cursor on top of a  "magic  cookie",  that  to
+       erase  standout  mode  it is instead necessary to use delete and insert
        line.  The ncurses implementation ignores this glitch.
 
-       The  Beehive Superbee, which is unable to correctly transmit the escape
-       or control/C characters, has xsb, indicating that the f1  key  is  used
-       for  escape  and  f2  for control/C.  (Only certain Superbees have this
-       problem, depending on the ROM.)  Note that in older terminfo  versions,
+       The Beehive Superbee, which is unable to correctly transmit the  escape
+       or  control/C  characters,  has xsb, indicating that the f1 key is used
+       for escape and f2 for control/C.  (Only  certain  Superbees  have  this
+       problem,  depending on the ROM.)  Note that in older terminfo versions,
        this capability was called "beehive_glitch"; it is now "no_esc_ctl_c".
 
-       Other  specific  terminal  problems  may  be  corrected  by adding more
+       Other specific terminal  problems  may  be  corrected  by  adding  more
        capabilities of the form xx.

Pitfalls of Long Entries

-       Long terminfo entries are unlikely to be a problem; to date,  no  entry
-       has   even   approached   terminfo's  4096-byte  string-table  maximum.
-       Unfortunately, the termcap translations are much more strictly  limited
+       Long  terminfo  entries are unlikely to be a problem; to date, no entry
+       has  even  approached  terminfo's   4096-byte   string-table   maximum.
+       Unfortunately,  the termcap translations are much more strictly limited
        (to 1023 bytes), thus termcap translations of long terminfo entries can
        cause problems.
 
-       The man pages for 4.3BSD and older versions  of  tgetent  instruct  the
-       user  to  allocate a 1024-byte buffer for the termcap entry.  The entry
-       gets null-terminated by the termcap library, so that makes the  maximum
-       safe  length  for a termcap entry 1k-1 (1023) bytes.  Depending on what
-       the application and the termcap library being used does, and  where  in
-       the  termcap  file  the terminal type that tgetent is searching for is,
+       The  man  pages  for  4.3BSD and older versions of tgetent instruct the
+       user to allocate a 1024-byte buffer for the termcap entry.   The  entry
+       gets  null-terminated by the termcap library, so that makes the maximum
+       safe length for a termcap entry 1k-1 (1023) bytes.  Depending  on  what
+       the  application  and the termcap library being used does, and where in
+       the termcap file the terminal type that tgetent is  searching  for  is,
        several bad things can happen.
 
-       Some termcap libraries print a warning message or exit if they find  an
+       Some  termcap libraries print a warning message or exit if they find an
        entry that's longer than 1023 bytes; others do not; others truncate the
-       entries to 1023 bytes.  Some application programs  allocate  more  than
+       entries  to  1023  bytes.  Some application programs allocate more than
        the recommended 1K for the termcap entry; others do not.
 
-       Each  termcap  entry has two important sizes associated with it: before
-       "tc" expansion, and after "tc" expansion.  "tc" is the capability  that
+       Each termcap entry has two important sizes associated with  it:  before
+       "tc"  expansion, and after "tc" expansion.  "tc" is the capability that
        tacks on another termcap entry to the end of the current one, to add on
        its capabilities.  If a termcap entry does not use the "tc" capability,
        then of course the two lengths are the same.
 
-       The  "before tc expansion" length is the most important one, because it
-       affects more than just users of that particular terminal.  This is  the
-       length  of the entry as it exists in /etc/termcap, minus the backslash-
+       The "before tc expansion" length is the most important one, because  it
+       affects  more than just users of that particular terminal.  This is the
+       length of the entry as it exists in /etc/termcap, minus the  backslash-
        newline pairs, which tgetent strips out while reading it.  Some termcap
        libraries strip off the final newline, too (GNU termcap does not).  Now
        suppose:
@@ -2532,88 +2537,88 @@
 
        o   and the application has only allocated a 1k buffer,
 
-       o   and the termcap library (like the one in BSD/OS 1.1 and GNU)  reads
-           the  whole entry into the buffer, no matter what its length, to see
+       o   and  the termcap library (like the one in BSD/OS 1.1 and GNU) reads
+           the whole entry into the buffer, no matter what its length, to  see
            if it is the entry it wants,
 
-       o   and tgetent is searching for a terminal type  that  either  is  the
-           long  entry,  appears  in the termcap file after the long entry, or
-           does not appear in the file at all (so that tgetent has  to  search
+       o   and  tgetent  is  searching  for a terminal type that either is the
+           long entry, appears in the termcap file after the  long  entry,  or
+           does  not  appear in the file at all (so that tgetent has to search
            the whole termcap file).
 
-       Then  tgetent  will  overwrite  memory, perhaps its stack, and probably
-       core  dump  the  program.   Programs  like  telnet   are   particularly
-       vulnerable;  modern  telnets  pass  along values like the terminal type
-       automatically.  The results are almost as undesirable  with  a  termcap
-       library,  like SunOS 4.1.3 and Ultrix 4.4, that prints warning messages
-       when it reads an overly long  termcap  entry.   If  a  termcap  library
-       truncates  long entries, like OSF/1 3.0, it is immune to dying here but
+       Then tgetent will overwrite memory, perhaps  its  stack,  and  probably
+       core   dump   the  program.   Programs  like  telnet  are  particularly
+       vulnerable; modern telnets pass along values  like  the  terminal  type
+       automatically.   The  results  are almost as undesirable with a termcap
+       library, like SunOS 4.1.3 and Ultrix 4.4, that prints warning  messages
+       when  it  reads  an  overly  long  termcap entry.  If a termcap library
+       truncates long entries, like OSF/1 3.0, it is immune to dying here  but
        will return incorrect data for the terminal.
 
-       The "after tc expansion" length will  have  a  similar  effect  to  the
+       The  "after  tc  expansion"  length  will  have a similar effect to the
        above, but only for people who actually set TERM to that terminal type,
-       since tgetent only does "tc" expansion once it is  found  the  terminal
+       since  tgetent  only  does "tc" expansion once it is found the terminal
        type it was looking for, not while searching.
 
-       In  summary,  a termcap entry that is longer than 1023 bytes can cause,
-       on various combinations of termcap libraries and applications,  a  core
-       dump,  warnings, or incorrect operation.  If it is too long even before
-       "tc" expansion, it will have this effect even for users of  some  other
-       terminal  types  and  users whose TERM variable does not have a termcap
+       In summary, a termcap entry that is longer than 1023 bytes  can  cause,
+       on  various  combinations of termcap libraries and applications, a core
+       dump, warnings, or incorrect operation.  If it is too long even  before
+       "tc"  expansion,  it will have this effect even for users of some other
+       terminal types and users whose TERM variable does not  have  a  termcap
        entry.
 
-       When in -C (translate to termcap) mode, the ncurses  implementation  of
-       tic(1m)  issues  warning  messages  when the pre-tc length of a termcap
-       translation is too long.  The -c (check) option  also  checks  resolved
+       When  in  -C (translate to termcap) mode, the ncurses implementation of
+       tic(1m) issues warning messages when the pre-tc  length  of  a  termcap
+       translation  is  too  long.  The -c (check) option also checks resolved
        (after tc expansion) lengths.

Binary Compatibility

-       It  is  not  wise  to  count  on portability of binary terminfo entries
-       between commercial UNIX versions.  The problem is  that  there  are  at
-       least  two  versions  of  terminfo (under HP-UX and AIX) which diverged
-       from  System  V  terminfo  after  SVr1,  and   have   added   extension
-       capabilities  to  the  string table that (in the binary format) collide
+       It is not wise to count  on  portability  of  binary  terminfo  entries
+       between  commercial  UNIX  versions.   The problem is that there are at
+       least two versions of terminfo (under HP-UX  and  AIX)  which  diverged
+       from   System   V   terminfo  after  SVr1,  and  have  added  extension
+       capabilities to the string table that (in the  binary  format)  collide
        with System V and XSI Curses extensions.

EXTENSIONS

-       Searching   for   terminal   descriptions   in   $HOME/.terminfo    and
+       Searching    for   terminal   descriptions   in   $HOME/.terminfo   and
        TERMINFO_DIRS is not supported by older implementations.
 
-       Some  SVr4  curses  implementations,  and  all previous to SVr4, do not
+       Some SVr4 curses implementations, and all  previous  to  SVr4,  do  not
        interpret the %A and %O operators in parameter strings.
 
-       SVr4/XPG4 do not specify whether msgr licenses  movement  while  in  an
-       alternate-character-set  mode  (such modes may, among other things, map
-       CR and NL to characters  that  do  not  trigger  local  motions).   The
-       ncurses  implementation  ignores  msgr in ALTCHARSET mode.  This raises
+       SVr4/XPG4  do  not  specify  whether msgr licenses movement while in an
+       alternate-character-set mode (such modes may, among other  things,  map
+       CR  and  NL  to  characters  that  do  not trigger local motions).  The
+       ncurses implementation ignores msgr in ALTCHARSET  mode.   This  raises
        the  possibility  that  an  XPG4  implementation  making  the  opposite
-       interpretation  may need terminfo entries made for ncurses to have msgr
+       interpretation may need terminfo entries made for ncurses to have  msgr
        turned off.
 
        The ncurses library handles insert-character and insert-character modes
-       in  a  slightly  non-standard way to get better update efficiency.  See
+       in a slightly non-standard way to get better  update  efficiency.   See
        the Insert/Delete Character subsection above.
 
-       The parameter substitutions for set_clock  and  display_clock  are  not
-       documented  in  SVr4 or the XSI Curses standard.  They are deduced from
+       The  parameter  substitutions  for  set_clock and display_clock are not
+       documented in SVr4 or the XSI Curses standard.  They are  deduced  from
        the documentation for the AT&T 505 terminal.
 
-       Be careful assigning the kmous capability.  The ncurses  library  wants
-       to  interpret  it as KEY_MOUSE, for use by terminals and emulators like
-       xterm that can return mouse-tracking information in the  keyboard-input
+       Be  careful  assigning the kmous capability.  The ncurses library wants
+       to interpret it as KEY_MOUSE, for use by terminals and  emulators  like
+       xterm  that can return mouse-tracking information in the keyboard-input
        stream.
 
-       X/Open  Curses  does  not  mention italics.  Portable applications must
-       assume that  numeric  capabilities  are  signed  16-bit  values.   This
-       includes  the  no_color_video  (ncv)  capability.  The 32768 mask value
-       used for italics with ncv can be confused with an absent  or  cancelled
-       ncv.   If  italics  should work with colors, then the ncv value must be
+       X/Open Curses does not mention  italics.   Portable  applications  must
+       assume  that  numeric  capabilities  are  signed  16-bit  values.  This
+       includes the no_color_video (ncv) capability.   The  32768  mask  value
+       used  for  italics with ncv can be confused with an absent or cancelled
+       ncv.  If italics should work with colors, then the ncv  value  must  be
        specified, even if it is zero.
 
-       Different commercial ports of terminfo  and  curses  support  different
-       subsets  of  the  XSI  Curses  standard  and  (in some cases) different
+       Different  commercial  ports  of  terminfo and curses support different
+       subsets of the XSI  Curses  standard  and  (in  some  cases)  different
        extension sets.  Here is a summary, accurate as of October 1995:
 
        o   SVR4, Solaris, ncurses -- These support all SVr4 capabilities.
@@ -2621,16 +2626,16 @@
        o   SGI -- Supports the SVr4 set, adds one undocumented extended string
            capability (set_pglen).
 
-       o   SVr1,  Ultrix  --  These  support  a  restricted subset of terminfo
-           capabilities.  The booleans end with xon_xoff;  the  numerics  with
+       o   SVr1, Ultrix -- These  support  a  restricted  subset  of  terminfo
+           capabilities.   The  booleans  end with xon_xoff; the numerics with
            width_status_line; and the strings with prtr_non.
 
-       o   HP/UX  --  Supports  the  SVr1  subset,  plus the SVr[234] numerics
-           num_labels,  label_height,  label_width,  plus  function  keys   11
-           through  63,  plus  plab_norm,  label_on,  and label_off, plus some
+       o   HP/UX -- Supports the  SVr1  subset,  plus  the  SVr[234]  numerics
+           num_labels,   label_height,  label_width,  plus  function  keys  11
+           through 63, plus plab_norm,  label_on,  and  label_off,  plus  some
            incompatible extensions in the string table.
 
-       o   AIX -- Supports the SVr1 subset, plus function keys 11 through  63,
+       o   AIX  -- Supports the SVr1 subset, plus function keys 11 through 63,
            plus a number of incompatible string table extensions.
 
        o   OSF -- Supports both the SVr4 set and the AIX extensions.
@@ -2641,8 +2646,8 @@

SEE ALSO

-       infocmp(1m),     tabs(1),    tic(1m),    curses(3x),    curs_color(3x),
-       curs_variables(3x),    printf(3),     term_variables(3x).      term(5).
+       infocmp(1m),    tabs(1),    tic(1m),    curses(3x),     curs_color(3x),
+       curs_variables(3x),     printf(3),     term_variables(3x).     term(5).
        user_caps(5).
 
 
diff --git a/doc/html/man/tic.1m.html b/doc/html/man/tic.1m.html
index b70494c1..f3dd28f0 100644
--- a/doc/html/man/tic.1m.html
+++ b/doc/html/man/tic.1m.html
@@ -469,7 +469,7 @@
        captoinfo(1m),   infocmp(1m),   infotocap(1m),   toe(1m),   curses(3x),
        term(5).  terminfo(5).  user_caps(5).
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).

AUTHOR

diff --git a/doc/html/man/toe.1m.html b/doc/html/man/toe.1m.html
index 4a1c363e..57dea880 100644
--- a/doc/html/man/toe.1m.html
+++ b/doc/html/man/toe.1m.html
@@ -171,7 +171,7 @@
        captoinfo(1m),   infocmp(1m),   infotocap(1m),   tic(1m),   curses(3x),
        terminfo(5).
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/doc/html/man/tput.1.html b/doc/html/man/tput.1.html
index 54c8dca1..8be62ebe 100644
--- a/doc/html/man/tput.1.html
+++ b/doc/html/man/tput.1.html
@@ -545,7 +545,7 @@

SEE ALSO

        clear(1), stty(1), tabs(1), tset(1), curs_termcap(3x), terminfo(5).
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/doc/html/man/tset.1.html b/doc/html/man/tset.1.html
index fa2fd400..f0452f1c 100644
--- a/doc/html/man/tset.1.html
+++ b/doc/html/man/tset.1.html
@@ -391,7 +391,7 @@
        csh(1),   sh(1),   stty(1),   curs_terminfo(3x),  tty(4),  terminfo(5),
        ttys(5), environ(7)
 
-       This describes ncurses version 6.3 (patch 20221126).
+       This describes ncurses version 6.3 (patch 20221210).
 
 
 
diff --git a/man/terminfo.tail b/man/terminfo.tail
index 070319c4..6abfda92 100644
--- a/man/terminfo.tail
+++ b/man/terminfo.tail
@@ -1,5 +1,5 @@
 .\"***************************************************************************
-.\" Copyright 2018-2020,2021 Thomas E. Dickey                                *
+.\" Copyright 2018-2021,2022 Thomas E. Dickey                                *
 .\" Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
 .\"                                                                          *
 .\" Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
-.\" $Id: terminfo.tail,v 1.110 2021/12/25 20:14:56 tom Exp $
+.\" $Id: terminfo.tail,v 1.113 2022/12/10 19:51:10 tom Exp $
 .ps +1
 .SS User-Defined Capabilities
 .
@@ -470,7 +470,7 @@ push \fIi\fP'th parameter
 \fB%P\fP\fI[a\-z]\fP
 set dynamic variable \fI[a\-z]\fP to \fIpop()\fP
 .TP
-\fB%g\fP\fI[a\-z]/\fP
+\fB%g\fP\fI[a\-z]\fP
 get dynamic variable \fI[a\-z]\fP and push it
 .TP
 \fB%P\fP\fI[A\-Z]\fP
@@ -511,8 +511,17 @@ variables in persistent storage, initialized to zeros.
 .bP
 Beginning with version 6.3, ncurses stores \fIstatic\fP and \fIdynamic\fP
 variables in the same manner as SVr4.
+.RS
+.bP
 Unlike other implementations, ncurses zeros dynamic variables 
 before the first \fB%g\fP or \fB%P\fP operator.
+.bP
+Like SVr2,
+the scope of dynamic variables in ncurses
+is within the current call to
+\fBtparm\fP.
+Use static variables if persistent storage is needed.
+.RE
 .RE
 .TP
 \fB%\(aq\fP\fIc\fP\fB\(aq\fP
diff --git a/ncurses/base/lib_set_term.c b/ncurses/base/lib_set_term.c
index 7e1a96c8..78de8592 100644
--- a/ncurses/base/lib_set_term.c
+++ b/ncurses/base/lib_set_term.c
@@ -41,8 +41,11 @@
 **
 */
 
+#define NEW_PAIR_INTERNAL 1
+
 #include 
 #include 
+#include 
 
 #if USE_GPM_SUPPORT
 #ifdef HAVE_LIBDL
@@ -54,7 +57,7 @@
 #undef CUR
 #define CUR SP_TERMTYPE
 
-MODULE_ID("$Id: lib_set_term.c,v 1.183 2022/10/22 19:32:40 tom Exp $")
+MODULE_ID("$Id: lib_set_term.c,v 1.184 2022/12/10 21:34:12 tom Exp $")
 
 #ifdef USE_TERM_DRIVER
 #define MaxColors      InfoOf(sp).maxcolors
@@ -194,6 +197,7 @@ delscreen(SCREEN *sp)
 
 	FreeIfNeeded(sp->_current_attr);
 
+	_nc_free_ordered_pairs(sp);
 	FreeIfNeeded(sp->_color_table);
 	FreeIfNeeded(sp->_color_pairs);
 
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index e40862bd..86510b5e 100644
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20221203) unstable; urgency=low
+ncurses6 (6.3+20221210) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 03 Dec 2022 06:17:39 -0500
+ -- Thomas E. Dickey   Sat, 10 Dec 2022 06:24:32 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index e40862bd..86510b5e 100644
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20221203) unstable; urgency=low
+ncurses6 (6.3+20221210) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 03 Dec 2022 06:17:39 -0500
+ -- Thomas E. Dickey   Sat, 10 Dec 2022 06:24:32 -0500
 
 ncurses6 (5.9+20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index cdf2e8bb..37a991ef 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.3+20221203) unstable; urgency=low
+ncurses6 (6.3+20221210) unstable; urgency=low
 
   * latest weekly patch
 
- -- Thomas E. Dickey   Sat, 03 Dec 2022 06:17:39 -0500
+ -- Thomas E. Dickey   Sat, 10 Dec 2022 06:24:32 -0500
 
 ncurses6 (5.9+20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index fe1570dc..54455c82 100644
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.554 2022/12/03 11:17:39 tom Exp $
+; $Id: mingw-ncurses.nsi,v 1.555 2022/12/10 11:24:32 tom Exp $
 
 ; TODO add examples
 ; TODO bump ABI to 6
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"
 !define VERSION_MINOR "3"
 !define VERSION_YYYY  "2022"
-!define VERSION_MMDD  "1203"
+!define VERSION_MMDD  "1210"
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
 
 !define MY_ABI   "5"
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index f0a122ee..b8aff8c1 100644
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.3
-Release: 20221203
+Release: 20221210
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 01efb066..74305cc4 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.3
-Release: 20221203
+Release: 20221210
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 5c0e8896..f194d8a6 100644
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.3
-Release: 20221203
+Release: 20221210
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/test/back_ground.c b/test/back_ground.c
index 295494b4..c53c2a36 100644
--- a/test/back_ground.c
+++ b/test/back_ground.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: back_ground.c,v 1.8 2022/12/04 00:38:34 tom Exp $
+ * $Id: back_ground.c,v 1.9 2022/12/10 22:28:50 tom Exp $
  */
 
 #include 
@@ -202,7 +202,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
 #if HAVE_ASSUME_DEFAULT_COLORS
     int a_option = 0;
diff --git a/test/background.c b/test/background.c
index 2811ea9c..5942debb 100644
--- a/test/background.c
+++ b/test/background.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: background.c,v 1.23 2022/12/04 00:40:11 tom Exp $
+ * $Id: background.c,v 1.24 2022/12/10 22:28:50 tom Exp $
  */
 
 #define NEED_COLOR_CODE 1
@@ -159,7 +159,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
 #if HAVE_ASSUME_DEFAULT_COLORS
     int a_option = 0;
diff --git a/test/blue.c b/test/blue.c
index 71b758a0..90f240b6 100644
--- a/test/blue.c
+++ b/test/blue.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2019-2021,2022 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -37,7 +37,7 @@
  *****************************************************************************/
 
 /*
- * $Id: blue.c,v 1.54 2021/03/20 16:06:15 tom Exp $
+ * $Id: blue.c,v 1.55 2022/12/10 23:31:31 tom Exp $
  */
 
 #include 
@@ -465,9 +465,44 @@ use_pc_display(void)
 #define use_pc_display()	/* nothing */
 #endif /* HAVE_LANGINFO_CODESET */
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: blue [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     setlocale(LC_ALL, "");
 
     use_pc_display();
diff --git a/test/bs.c b/test/bs.c
index 0a074bb0..3e773317 100644
--- a/test/bs.c
+++ b/test/bs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
  * v2.1 with ncurses mouse support, September 1995
  *
- * $Id: bs.c,v 1.77 2021/06/17 21:11:08 tom Exp $
+ * $Id: bs.c,v 1.78 2022/12/11 00:18:37 tom Exp $
  */
 
 #include 
@@ -1162,55 +1162,6 @@ playagain(void)
     return (sgetc("YN") == 'Y');
 }
 
-static void
-do_options(int c, char *op[])
-{
-    if (c > 1) {
-	int i;
-
-	for (i = 1; i < c; i++) {
-	    switch (op[i][0]) {
-	    default:
-	    case '?':
-		(void) fprintf(stderr, "Usage: bs [-s | -b] [-c]\n");
-		(void) fprintf(stderr, "\tWhere the options are:\n");
-		(void) fprintf(stderr, "\t-s : play a salvo game\n");
-		(void) fprintf(stderr, "\t-b : play a blitz game\n");
-		(void) fprintf(stderr, "\t-c : ships may be adjacent\n");
-		ExitProgram(EXIT_FAILURE);
-		break;
-	    case '-':
-		switch (op[i][1]) {
-		case 'b':
-		    blitz = 1;
-		    if (salvo == 1) {
-			(void) fprintf(stderr,
-				       "Bad Arg: -b and -s are mutually exclusive\n");
-			ExitProgram(EXIT_FAILURE);
-		    }
-		    break;
-		case 's':
-		    salvo = 1;
-		    if (blitz == 1) {
-			(void) fprintf(stderr,
-				       "Bad Arg: -s and -b are mutually exclusive\n");
-			ExitProgram(EXIT_FAILURE);
-		    }
-		    break;
-		case 'c':
-		    closepack = 1;
-		    break;
-		default:
-		    (void) fprintf(stderr,
-				   "Bad arg: type \"%s ?\" for usage message\n",
-				   op[0]);
-		    ExitProgram(EXIT_FAILURE);
-		}
-	    }
-	}
-    }
-}
-
 static int
 scount(int who)
 {
@@ -1231,12 +1182,68 @@ scount(int who)
     return (shots);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: bs [options]"
+	,""
+	,USAGE_COMMON
+	,"Options:"
+	," -b       play a blitz game"
+	," -c       ships may be adjacent"
+	," -s       play a salvo game"
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
-    setlocale(LC_ALL, "");
+    int ch;
 
-    do_options(argc, argv);
+    while ((ch = getopt(argc, argv, OPTS_COMMON "bcs")) != -1) {
+	switch (ch) {
+	case 'b':
+	    blitz = 1;
+	    if (salvo == 1) {
+		(void) fprintf(stderr,
+			       "Bad Arg: -b and -s are mutually exclusive\n");
+		ExitProgram(EXIT_FAILURE);
+	    }
+	    break;
+	case 's':
+	    salvo = 1;
+	    if (blitz == 1) {
+		(void) fprintf(stderr,
+			       "Bad Arg: -s and -b are mutually exclusive\n");
+		ExitProgram(EXIT_FAILURE);
+	    }
+	    break;
+	case 'c':
+	    closepack = 1;
+	    break;
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
+    setlocale(LC_ALL, "");
 
     intro();
     do {
diff --git a/test/chgat.c b/test/chgat.c
index a5bcbea2..2c2b5391 100644
--- a/test/chgat.c
+++ b/test/chgat.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
  * Copyright 2006-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: chgat.c,v 1.19 2020/02/02 23:34:34 tom Exp $
+ * $Id: chgat.c,v 1.20 2022/12/10 23:31:31 tom Exp $
  *
  * test-driver for chgat/wchgat/mvchgat/mvwchgat
  */
@@ -348,9 +348,44 @@ test_chgat(void)
     } while ((st.ch = getch()) != ERR);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: chgat [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     initscr();
     cbreak();
     noecho();
diff --git a/test/clip_printw.c b/test/clip_printw.c
index ed254a1f..49d67c53 100644
--- a/test/clip_printw.c
+++ b/test/clip_printw.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: clip_printw.c,v 1.20 2022/04/16 18:26:05 tom Exp $
+ * $Id: clip_printw.c,v 1.21 2022/12/10 23:31:31 tom Exp $
  *
  * demonstrate how to use printw without wrapping.
  */
@@ -358,9 +358,44 @@ test_clipping(WINDOW *win)
     } while ((st.ch = wgetch(win)) != ERR);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: clip_printw [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     setlocale(LC_ALL, "");
     initscr();
     cbreak();
diff --git a/test/color_content.c b/test/color_content.c
index f40988b8..c9aaf2fa 100644
--- a/test/color_content.c
+++ b/test/color_content.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: color_content.c,v 1.17 2022/12/04 00:40:11 tom Exp $
+ * $Id: color_content.c,v 1.18 2022/12/10 22:28:50 tom Exp $
  */
 
 #define NEED_TIME_H
@@ -253,7 +253,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 
diff --git a/test/color_set.c b/test/color_set.c
index a6e5e0dd..5510a0fd 100644
--- a/test/color_set.c
+++ b/test/color_set.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: color_set.c,v 1.11 2022/04/16 18:26:40 tom Exp $
+ * $Id: color_set.c,v 1.12 2022/12/10 23:36:59 tom Exp $
  */
 
 #include 
@@ -36,10 +36,44 @@
 
 #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: color_set [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     NCURSES_COLOR_T f, b;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
     setlocale(LC_ALL, "");
     initscr();
diff --git a/test/combine.c b/test/combine.c
index d2c3caf9..eca72b80 100644
--- a/test/combine.c
+++ b/test/combine.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: combine.c,v 1.22 2022/12/04 00:40:11 tom Exp $
+ * $Id: combine.c,v 1.23 2022/12/10 22:28:50 tom Exp $
  */
 
 #include 
@@ -206,7 +206,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
     int left_at = ' ';
diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c
index e968525e..ed36b4c1 100644
--- a/test/demo_altkeys.c
+++ b/test/demo_altkeys.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_altkeys.c,v 1.15 2022/04/16 18:26:57 tom Exp $
+ * $Id: demo_altkeys.c,v 1.16 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2005/10/22
@@ -71,8 +71,28 @@ log_last_line(WINDOW *win)
     }
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: demo_altkeys [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int n;
     int ch;
@@ -80,6 +100,19 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     struct timeval previous;
 #endif
 
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     unlink(MY_LOGFILE);
 
     setlocale(LC_ALL, "");
diff --git a/test/demo_defkey.c b/test/demo_defkey.c
index 7835ee84..44d60dc9 100644
--- a/test/demo_defkey.c
+++ b/test/demo_defkey.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_defkey.c,v 1.32 2022/04/16 18:26:57 tom Exp $
+ * $Id: demo_defkey.c,v 1.33 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate the define_key() function.
  * Thomas Dickey - 2002/11/23
@@ -214,14 +214,47 @@ remove_definition(WINDOW *win, int code)
     really_define_key(win, 0, code);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: demo_defkey [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     char *fkeys[12];
     int n;
     int ch;
     WINDOW *win;
 
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     unlink(MY_LOGFILE);
 
     setlocale(LC_ALL, "");
diff --git a/test/demo_keyok.c b/test/demo_keyok.c
index eb8433d0..8f4ae906 100644
--- a/test/demo_keyok.c
+++ b/test/demo_keyok.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: demo_keyok.c,v 1.8 2022/04/16 18:26:57 tom Exp $
+ * $Id: demo_keyok.c,v 1.9 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate the keyok() function.
  * Thomas Dickey - 2002/11/23
@@ -36,14 +36,47 @@
 #include 
 
 #if defined(NCURSES_VERSION) && NCURSES_EXT_FUNCS
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: demo_keyok [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int lastch = ERR;
     int prior = ERR;
     int ch;
     WINDOW *win;
 
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     setlocale(LC_ALL, "");
     initscr();
     (void) cbreak();		/* take input chars one at a time, no wait for \n */
diff --git a/test/demo_termcap.c b/test/demo_termcap.c
index 19fd7dea..468bd976 100644
--- a/test/demo_termcap.c
+++ b/test/demo_termcap.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_termcap.c,v 1.63 2022/12/04 00:40:11 tom Exp $
+ * $Id: demo_termcap.c,v 1.64 2022/12/10 23:22:09 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -923,8 +923,7 @@ main(int argc, char *argv[])
 
 #else
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(void)
 {
     failed("This program requires termcap");
 }
diff --git a/test/demo_terminfo.c b/test/demo_terminfo.c
index 5b24c607..1b2d426c 100644
--- a/test/demo_terminfo.c
+++ b/test/demo_terminfo.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: demo_terminfo.c,v 1.55 2022/12/04 00:40:11 tom Exp $
+ * $Id: demo_terminfo.c,v 1.56 2022/12/10 23:22:09 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -954,7 +954,7 @@ main(int argc, char *argv[])
 
 #else /* !HAVE_TIGETSTR */
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     failed("This program requires the terminfo functions such as tigetstr");
     ExitProgram(EXIT_FAILURE);
diff --git a/test/ditto.c b/test/ditto.c
index 06b63553..f432ea71 100644
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
- * $Id: ditto.c,v 1.55 2022/12/04 00:40:55 tom Exp $
+ * $Id: ditto.c,v 1.56 2022/12/10 22:10:49 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -386,91 +386,94 @@ usage(int ok)
 	fprintf(stderr, "%s\n", msg[n]);
 
     ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
-/* *INDENT-OFF* */}
+}
+/* *INDENT-OFF* */
 VERSION_COMMON()
 /* *INDENT-ON* */
 
-    int
-      main(int argc, char *argv[]) {
-	int j;
-	int ch;
-	DITTO *data;
+int
+main(int argc, char *argv[])
+{
+    int j;
+    int ch;
+    DITTO *data;
 #ifndef USE_PTHREADS
-	int count;
+    int count;
 #endif
 
-	while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
-	    switch (ch) {
-	    case OPTS_VERSION:
-		show_version(argv);
-		ExitProgram(EXIT_SUCCESS);
-		default:
-		usage(ch == OPTS_USAGE);
-		/* NOTREACHED */
-	    }
-	} if (optind < argc)
-	      usage(FALSE);
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
-	if ((data = typeCalloc(DITTO, (size_t) argc)) == 0)
-	    failed("calloc data");
+    if ((data = typeCalloc(DITTO, (size_t) argc)) == 0)
+	failed("calloc data");
 
-	assert(data != 0);
+    assert(data != 0);
 
-	for (j = 0; j < argc; j++) {
-	    open_screen(&data[j], argv, argc, j);
-	}
+    for (j = 0; j < argc; j++) {
+	open_screen(&data[j], argv, argc, j);
+    }
 
 #ifdef USE_PTHREADS
-	/*
-	 * For multi-threaded operation, set up a reader for each of the screens.
-	 * That uses blocking I/O rather than polling for input, so no calls to
-	 * napms() are needed.
-	 */
-	for (j = 0; j < argc; j++) {
-	    (void) pthread_create(&(data[j].thread), NULL, handle_screen,
-				  &data[j]);
-	}
-	pthread_join(data[1].thread, NULL);
+    /*
+     * For multi-threaded operation, set up a reader for each of the screens.
+     * That uses blocking I/O rather than polling for input, so no calls to
+     * napms() are needed.
+     */
+    for (j = 0; j < argc; j++) {
+	(void) pthread_create(&(data[j].thread), NULL, handle_screen,
+			      &data[j]);
+    }
+    pthread_join(data[1].thread, NULL);
 #else
-	/*
-	 * Loop, reading characters from any of the inputs and writing to all
-	 * of the screens.
-	 */
-	for (count = 0;; ++count) {
-	    DDATA ddata;
-	    int which = (count % argc);
+    /*
+     * Loop, reading characters from any of the inputs and writing to all
+     * of the screens.
+     */
+    for (count = 0;; ++count) {
+	DDATA ddata;
+	int which = (count % argc);
 
-	    napms(20);
+	napms(20);
 
-	    ddata.source = which;
-	    ddata.ditto = data;
+	ddata.source = which;
+	ddata.ditto = data;
 
-	    ch = USING_SCREEN(data[which].screen, read_screen, &ddata);
-	    if (ch == CTRL('D')) {
-		break;
-	    } else if (ch != ERR) {
-		show_ditto(data, argc, &ddata);
-	    }
+	ch = USING_SCREEN(data[which].screen, read_screen, &ddata);
+	if (ch == CTRL('D')) {
+	    break;
+	} else if (ch != ERR) {
+	    show_ditto(data, argc, &ddata);
 	}
+    }
 #endif
 
+    /*
+     * Cleanup and exit
+     */
+    for (j = argc - 1; j >= 0; j--) {
+	USING_SCREEN(data[j].screen, close_screen, 0);
+	fprintf(data[j].output, "**Closed\r\n");
+
 	/*
-	 * Cleanup and exit
+	 * Closing before a delscreen() helps ncurses determine that there
+	 * is no valid output buffer, and can remove the setbuf() data.
 	 */
-	for (j = argc - 1; j >= 0; j--) {
-	    USING_SCREEN(data[j].screen, close_screen, 0);
-	    fprintf(data[j].output, "**Closed\r\n");
-
-	    /*
-	     * Closing before a delscreen() helps ncurses determine that there
-	     * is no valid output buffer, and can remove the setbuf() data.
-	     */
-	    fflush(data[j].output);
-	    fclose(data[j].output);
-	    delscreen(data[j].screen);
-	}
-	ExitProgram(EXIT_SUCCESS);
+	fflush(data[j].output);
+	fclose(data[j].output);
+	delscreen(data[j].screen);
     }
+    ExitProgram(EXIT_SUCCESS);
+}
 #else
 int
 main(void)
diff --git a/test/dots.c b/test/dots.c
index 8ec53f30..372b76f6 100644
--- a/test/dots.c
+++ b/test/dots.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey  1999
  *
- * $Id: dots.c,v 1.43 2022/12/04 00:40:11 tom Exp $
+ * $Id: dots.c,v 1.44 2022/12/10 23:22:09 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -140,8 +140,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc,
-     char *argv[])
+main(int argc, char *argv[])
 {
     int ch;
     double r;
@@ -243,8 +242,7 @@ main(int argc,
 }
 #else
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(void)
 {
     fprintf(stderr, "This program requires terminfo\n");
     exit(EXIT_FAILURE);
diff --git a/test/dots_mvcur.c b/test/dots_mvcur.c
index 26db2e11..de1e0668 100644
--- a/test/dots_mvcur.c
+++ b/test/dots_mvcur.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey - 2007
  *
- * $Id: dots_mvcur.c,v 1.29 2022/12/04 00:40:11 tom Exp $
+ * $Id: dots_mvcur.c,v 1.30 2022/12/10 23:22:09 tom Exp $
  *
  * A simple demo of the terminfo interface, and mvcur.
  */
@@ -141,8 +141,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int x0 = 1, y0 = 1;
     int ch;
@@ -260,8 +259,7 @@ main(int argc GCC_UNUSED,
 }
 #else
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(void)
 {
     fprintf(stderr, "This program requires terminfo\n");
     exit(EXIT_FAILURE);
diff --git a/test/dots_termcap.c b/test/dots_termcap.c
index aa1d1988..041465ed 100644
--- a/test/dots_termcap.c
+++ b/test/dots_termcap.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_termcap.c,v 1.29 2022/12/04 00:40:11 tom Exp $
+ * $Id: dots_termcap.c,v 1.30 2022/12/10 23:22:09 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -326,8 +326,7 @@ main(int argc, char *argv[])
 }
 #else
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(void)
 {
     fprintf(stderr, "This program requires termcap\n");
     exit(EXIT_FAILURE);
diff --git a/test/dup_field.c b/test/dup_field.c
index 05444f43..3e0b7693 100644
--- a/test/dup_field.c
+++ b/test/dup_field.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: dup_field.c,v 1.6 2022/05/21 20:59:26 tom Exp $
+ * $Id: dup_field.c,v 1.7 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate dup_field().
  */
@@ -377,9 +377,44 @@ demo_forms(void)
     nl();
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: dup_field [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(void)
+main(int argc, char *argv[])
 {
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     setlocale(LC_ALL, "");
 
     initscr();
diff --git a/test/echochar.c b/test/echochar.c
index 0033f873..1d981574 100644
--- a/test/echochar.c
+++ b/test/echochar.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: echochar.c,v 1.24 2022/12/04 00:40:11 tom Exp $
+ * $Id: echochar.c,v 1.25 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the echochar function (compare to dots.c).
  * Thomas Dickey - 2006/11/4
@@ -101,8 +101,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
     double r;
diff --git a/test/extended_color.c b/test/extended_color.c
index 7f827bec..746c0359 100644
--- a/test/extended_color.c
+++ b/test/extended_color.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: extended_color.c,v 1.19 2022/12/04 00:40:11 tom Exp $
+ * $Id: extended_color.c,v 1.20 2022/12/10 22:28:50 tom Exp $
  */
 
 #include 
@@ -160,7 +160,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
     int i;
diff --git a/test/firstlast.c b/test/firstlast.c
index 0a8e5ee0..c66c2b85 100644
--- a/test/firstlast.c
+++ b/test/firstlast.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2022 Thomas E. Dickey                                     *
  * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
  * This test was written by Alexander V. Lukyanov to demonstrate difference
  * between ncurses 4.1 and SVR4 curses
  *
- * $Id: firstlast.c,v 1.9 2020/02/02 23:34:34 tom Exp $
+ * $Id: firstlast.c,v 1.10 2022/12/10 23:31:31 tom Exp $
  */
 
 #include 
@@ -71,11 +71,45 @@ fill(WINDOW *w, const char *str)
     }
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: firstlast [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     WINDOW *large, *small;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     initscr();
     noecho();
 
diff --git a/test/foldkeys.c b/test/foldkeys.c
index ba4d18ca..99471716 100644
--- a/test/foldkeys.c
+++ b/test/foldkeys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey, 2006
  *
- * $Id: foldkeys.c,v 1.10 2021/08/08 00:41:57 tom Exp $
+ * $Id: foldkeys.c,v 1.11 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate a method for altering key definitions at runtime.
  *
@@ -193,14 +193,47 @@ demo_foldkeys(void)
     printw("Merged to %d key definitions\n", info_len - merged);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: foldkeys [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 #if HAVE_GETTIMEOFDAY
     struct timeval previous;
 #endif
 
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     if (newterm(0, stdout, stdin) == 0) {
 	fprintf(stderr, "Cannot initialize terminal\n");
 	ExitProgram(EXIT_FAILURE);
diff --git a/test/form_driver_w.c b/test/form_driver_w.c
index dd7ea68c..544060dc 100644
--- a/test/form_driver_w.c
+++ b/test/form_driver_w.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2022 Thomas E. Dickey                                     *
  * Copyright 2013-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -32,7 +32,7 @@
  ****************************************************************************/
 
 /*
- * $Id: form_driver_w.c,v 1.16 2020/02/02 23:34:34 tom Exp $
+ * $Id: form_driver_w.c,v 1.17 2022/12/10 23:31:31 tom Exp $
  *
  * Test form_driver_w (int, int, wchar_t), a wide char aware
  * replacement of form_driver.
@@ -45,8 +45,28 @@
 
 #include 
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: form_driver_w [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(void)
+main(int argc, char *argv[])
 {
     static const char *help[] =
     {
@@ -64,6 +84,20 @@ main(void)
     FORM *my_form;
     bool done = FALSE;
     int n;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
     setlocale(LC_ALL, "");
 
@@ -94,14 +128,14 @@ main(void)
 
     /* Loop through to get user requests */
     while (!done) {
-	wint_t ch;
-	int ret = get_wch(&ch);
+	wint_t c2;
+	int ret = get_wch(&c2);
 
 	mvprintw(MyRow(NUM_FIELDS),
 		 MyCol(NUM_FIELDS),
 		 "Got %d (%#x), type: %s",
-		 (int) ch,
-		 (int) ch,
+		 (int) c2,
+		 (int) c2,
 		 (ret == KEY_CODE_YES)
 		 ? "KEY_CODE_YES"
 		 : ((ret == OK)
@@ -113,7 +147,7 @@ main(void)
 
 	switch (ret) {
 	case KEY_CODE_YES:
-	    switch (ch) {
+	    switch (c2) {
 	    case KEY_DOWN:
 		/* Go to next field */
 		form_driver_w(my_form, KEY_CODE_YES, REQ_NEXT_FIELD);
@@ -132,7 +166,7 @@ main(void)
 	    }
 	    break;
 	case OK:
-	    switch (ch) {
+	    switch (c2) {
 	    case CTRL('D'):
 	    case QUIT:
 	    case ESCAPE:
@@ -146,7 +180,7 @@ main(void)
 		popup_msg(form_win(my_form), help);
 		break;
 	    default:
-		form_driver_w(my_form, OK, (wchar_t) ch);
+		form_driver_w(my_form, OK, (wchar_t) c2);
 		break;
 	    }
 	    break;
diff --git a/test/inch_wide.c b/test/inch_wide.c
index e44a5f51..7b838d1d 100644
--- a/test/inch_wide.c
+++ b/test/inch_wide.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inch_wide.c,v 1.11 2020/02/02 23:34:34 tom Exp $
+ * $Id: inch_wide.c,v 1.13 2022/12/10 23:55:34 tom Exp $
  */
 /*
        int in_wch(cchar_t *wcval);
@@ -259,19 +259,49 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     return TRUE;
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: inch_wide [options] [file1 [...]]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
     WINDOW *chrbox;
     WINDOW *chrwin;
     WINDOW *strwin;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
 
     setlocale(LC_ALL, "");
 
-    if (argc < 2) {
-	fprintf(stderr, "usage: %s file1 [file2 [...]]\n", argv[0]);
-	return EXIT_FAILURE;
-    }
+    if (optind + 1 > argc)
+	usage(FALSE);
 
     initscr();
 
@@ -282,7 +312,7 @@ main(int argc, char *argv[])
     chrwin = derwin(chrbox, 1, COLS - 2, 1, 1);
     strwin = derwin(chrbox, 4, COLS - 2, 2, 1);
 
-    test_inchs(1, argv, chrwin, strwin);
+    test_inchs(optind, argv, chrwin, strwin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/inchs.c b/test/inchs.c
index 1d1691a6..b5922dd6 100644
--- a/test/inchs.c
+++ b/test/inchs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
  * Copyright 2007-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inchs.c,v 1.18 2020/02/02 23:34:34 tom Exp $
+ * $Id: inchs.c,v 1.19 2022/12/11 00:01:39 tom Exp $
  *
  * Author: Thomas E Dickey
  */
@@ -271,19 +271,49 @@ test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     return TRUE;
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: inchs [options] file1 [file2 [...]]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
     WINDOW *chrbox;
     WINDOW *chrwin;
     WINDOW *strwin;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
 
     setlocale(LC_ALL, "");
 
-    if (argc < 2) {
-	fprintf(stderr, "usage: %s file1 [file2 [...]]\n", argv[0]);
-	return EXIT_FAILURE;
-    }
+    if (optind + 1 > argc)
+	usage(FALSE);
 
     initscr();
 
@@ -294,7 +324,7 @@ main(int argc, char *argv[])
     chrwin = derwin(chrbox, 1, COLS - 2, 1, 1);
     strwin = derwin(chrbox, 4, COLS - 2, 2, 1);
 
-    test_inchs(1, argv, chrwin, strwin);
+    test_inchs(optind, argv, chrwin, strwin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/ins_wide.c b/test/ins_wide.c
index d76ae3ce..a7324493 100644
--- a/test/ins_wide.c
+++ b/test/ins_wide.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: ins_wide.c,v 1.29 2022/12/04 00:40:11 tom Exp $
+ * $Id: ins_wide.c,v 1.30 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the wins_wstr() and wins_wch functions.
  * Thomas Dickey - 2002/11/23
@@ -478,7 +478,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 
diff --git a/test/insdelln.c b/test/insdelln.c
index 55e606ae..52ccfb62 100644
--- a/test/insdelln.c
+++ b/test/insdelln.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
  * Copyright 2008-2014,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: insdelln.c,v 1.14 2020/02/02 23:34:34 tom Exp $
+ * $Id: insdelln.c,v 1.15 2022/12/10 23:31:31 tom Exp $
  *
  * test-driver for deleteln, wdeleteln, insdelln, winsdelln, insertln, winsertln
  */
@@ -371,9 +371,44 @@ test_insdelln(void)
     } while ((st.ch = getch()) != ERR);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: insdelln [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     initscr();
     cbreak();
     noecho();
diff --git a/test/inserts.c b/test/inserts.c
index 33268d43..b106ffc7 100644
--- a/test/inserts.c
+++ b/test/inserts.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: inserts.c,v 1.33 2022/12/04 00:40:11 tom Exp $
+ * $Id: inserts.c,v 1.34 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the winsstr() and winsch functions.
  * Thomas Dickey - 2002/10/19
@@ -407,7 +407,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 
diff --git a/test/list_keys.c b/test/list_keys.c
index 8312a4b6..ee54b856 100644
--- a/test/list_keys.c
+++ b/test/list_keys.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: list_keys.c,v 1.30 2022/12/04 00:40:11 tom Exp $
+ * $Id: list_keys.c,v 1.31 2022/12/10 23:23:27 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -504,7 +504,7 @@ main(int argc, char *argv[])
 
 #else
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     printf("This program requires the terminfo arrays\n");
     ExitProgram(EXIT_FAILURE);
@@ -512,7 +512,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 #endif
 #else /* !HAVE_TIGETSTR */
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     printf("This program requires the terminfo functions such as tigetstr\n");
     ExitProgram(EXIT_FAILURE);
diff --git a/test/lrtest.c b/test/lrtest.c
index 9c77577e..0e609d01 100644
--- a/test/lrtest.c
+++ b/test/lrtest.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
  * Copyright 1998-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -35,7 +35,7 @@
  * This can't be part of the ncurses test-program, because ncurses rips off the
  * bottom line to do labels.
  *
- * $Id: lrtest.c,v 1.27 2020/02/02 23:34:34 tom Exp $
+ * $Id: lrtest.c,v 1.29 2022/12/10 23:44:18 tom Exp $
  */
 
 #include 
@@ -82,10 +82,28 @@ show(MARK *m)
     }
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: lrtest [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(
-	int argc GCC_UNUSED,
-	char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     static MARK marks[] =
     {
@@ -97,6 +115,20 @@ main(
 	{1, 0, 1, 1, 1, '*' | A_REVERSE},
 	{2, 0, 1, 1, 1, '*' | A_REVERSE}
     };
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
     setlocale(LC_ALL, "");
 
@@ -132,7 +164,7 @@ main(
     }
 
     for (;;) {
-	int ch;
+	int c2;
 	unsigned n;
 
 	box(stdscr, 0, 0);
@@ -140,21 +172,21 @@ main(
 	    show(&marks[n]);
 	}
 
-	if ((ch = getch()) > 0) {
-	    if (ch == 'q')
+	if ((c2 = getch()) > 0) {
+	    if (c2 == 'q')
 		break;
-	    else if (ch == 's')
+	    else if (c2 == 's')
 		nodelay(stdscr, FALSE);
-	    else if (ch == ' ')
+	    else if (c2 == ' ')
 		nodelay(stdscr, TRUE);
 #ifdef TRACE
-	    else if (ch == 'T')
+	    else if (c2 == 'T')
 		curses_trace(0);
-	    else if (ch == 't')
+	    else if (c2 == 't')
 		curses_trace(TRACE_CALLS | TRACE_ICALLS | TRACE_UPDATE);
 #endif
 #ifdef KEY_RESIZE
-	    else if (ch == KEY_RESIZE) {
+	    else if (c2 == KEY_RESIZE) {
 		for (n = 0; n < SIZEOF(marks); n++) {
 		    if (marks[n].mode == 0) {	/* moving along x-direction */
 			if (marks[n].y)
diff --git a/test/move_field.c b/test/move_field.c
index 874b189b..e337319e 100644
--- a/test/move_field.c
+++ b/test/move_field.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: move_field.c,v 1.13 2022/05/21 20:59:46 tom Exp $
+ * $Id: move_field.c,v 1.14 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate move_field().
  */
@@ -474,9 +474,44 @@ demo_forms(void)
     nl();
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: move_field [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(void)
+main(int argc, char *argv[])
 {
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     setlocale(LC_ALL, "");
 
     initscr();
diff --git a/test/movewindow.c b/test/movewindow.c
index 1c8f42d1..7fe7329f 100644
--- a/test/movewindow.c
+++ b/test/movewindow.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 2018-2021,2022 Thomas E. Dickey                                *
  * Copyright 2006-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: movewindow.c,v 1.52 2021/12/18 18:57:55 tom Exp $
+ * $Id: movewindow.c,v 1.53 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate move functions for windows and derived windows from the curses
  * library.
@@ -671,13 +671,46 @@ show_help(WINDOW *current)
     free(msgs);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: movewindow [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     WINDOW *current_win;
     int ch;
     bool done = FALSE;
 
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
+
     initscr();
     cbreak();
     noecho();
diff --git a/test/newdemo.c b/test/newdemo.c
index d76523ab..78761534 100644
--- a/test/newdemo.c
+++ b/test/newdemo.c
@@ -2,7 +2,7 @@
  *  newdemo.c	-	A demo program using PDCurses. The program illustrate
  *  	 		the use of colours for text output.
  *
- * $Id: newdemo.c,v 1.47 2019/12/14 23:25:29 tom Exp $
+ * $Id: newdemo.c,v 1.48 2022/12/10 23:36:05 tom Exp $
  */
 
 #include 
@@ -215,17 +215,51 @@ BouncingBalls(WINDOW *win)
     return 0;
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: newdemo [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 /*
  *  Main driver
  */
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     WINDOW *win;
     int x, y, i, k;
     char buffer[SIZEOF(messages) * 80];
     int width, height;
     chtype save[80];
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
     setlocale(LC_ALL, "");
 
diff --git a/test/pair_content.c b/test/pair_content.c
index 07651807..24cf5689 100644
--- a/test/pair_content.c
+++ b/test/pair_content.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: pair_content.c,v 1.20 2022/12/04 00:40:11 tom Exp $
+ * $Id: pair_content.c,v 1.21 2022/12/10 22:28:50 tom Exp $
  */
 
 #define NEED_TIME_H
@@ -246,7 +246,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 
diff --git a/test/railroad.c b/test/railroad.c
index 3336f565..4d7c0700 100644
--- a/test/railroad.c
+++ b/test/railroad.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
  * Copyright 2000-2013,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey - 2000
  *
- * $Id: railroad.c,v 1.25 2020/09/05 21:43:37 tom Exp $
+ * $Id: railroad.c,v 1.26 2022/12/11 00:12:13 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -235,11 +235,44 @@ railroad(char **args)
     }
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: railroad [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
-    if (argc > 1) {
-	railroad(argv + 1);
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+
+    if (optind < argc) {
+	railroad(argv + optind);
     } else {
 	static char world[] = "Hello World";
 	static char *hello[] =
@@ -251,8 +284,7 @@ main(int argc, char *argv[])
 
 #else
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(void)
 {
     printf("This program requires termcap\n");
     exit(EXIT_FAILURE);
diff --git a/test/redraw.c b/test/redraw.c
index 776efe97..749f790b 100644
--- a/test/redraw.c
+++ b/test/redraw.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: redraw.c,v 1.16 2022/12/04 00:40:11 tom Exp $
+ * $Id: redraw.c,v 1.17 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the redrawwin() and wredrawln() functions.
  * Thomas Dickey - 2006/11/4
@@ -210,7 +210,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
     bool no_init = FALSE;
diff --git a/test/savescreen.c b/test/savescreen.c
index 50e54540..3ea61930 100644
--- a/test/savescreen.c
+++ b/test/savescreen.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: savescreen.c,v 1.61 2022/12/04 00:40:11 tom Exp $
+ * $Id: savescreen.c,v 1.62 2022/12/10 23:23:27 tom Exp $
  *
  * Demonstrate save/restore functions from the curses library.
  * Thomas Dickey - 2007/7/14
@@ -655,7 +655,7 @@ main(int argc, char *argv[])
 
 #else
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     printf("This program requires the screen-dump functions\n");
     ExitProgram(EXIT_FAILURE);
diff --git a/test/sp_tinfo.c b/test/sp_tinfo.c
index 68c88e6e..d003dfa3 100644
--- a/test/sp_tinfo.c
+++ b/test/sp_tinfo.c
@@ -28,7 +28,7 @@
  ****************************************************************************/
 
 /*
- * $Id: sp_tinfo.c,v 1.27 2022/12/04 00:40:11 tom Exp $
+ * $Id: sp_tinfo.c,v 1.28 2022/12/10 23:23:27 tom Exp $
  *
  * TOTO: add option for non-sp-funcs interface
  */
@@ -346,7 +346,7 @@ main(int argc, char *argv[])
 }
 #else
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     fprintf(stderr,
 	    "This program requires the low-level ncurses sp-funcs tputs_sp\n");
diff --git a/test/tclock.c b/test/tclock.c
index 0773b3b7..75b6570f 100644
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,4 +1,4 @@
-/* $Id: tclock.c,v 1.46 2022/12/04 00:40:11 tom Exp $ */
+/* $Id: tclock.c,v 1.47 2022/12/10 23:23:27 tom Exp $ */
 
 #define NEED_TIME_H
 #include 
@@ -294,7 +294,7 @@ main(int argc, char *argv[])
 }
 #else
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     printf("This program requires the header math.h and trignometric functions\n");
     ExitProgram(EXIT_FAILURE);
diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c
index 36fd335f..f69e1ddc 100644
--- a/test/test_add_wchstr.c
+++ b/test/test_add_wchstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_add_wchstr.c,v 1.33 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_add_wchstr.c,v 1.34 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the waddwchstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -566,7 +566,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 
diff --git a/test/test_addchstr.c b/test/test_addchstr.c
index f81b3f0b..cddc3152 100644
--- a/test/test_addchstr.c
+++ b/test/test_addchstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addchstr.c,v 1.28 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_addchstr.c,v 1.29 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the waddchstr() and waddch functions.
  * Thomas Dickey - 2009/9/12
@@ -484,7 +484,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 
diff --git a/test/test_addstr.c b/test/test_addstr.c
index f4070fb3..ba8a90e5 100644
--- a/test/test_addstr.c
+++ b/test/test_addstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addstr.c,v 1.19 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_addstr.c,v 1.20 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the waddstr() and waddch functions.
  * Thomas Dickey - 2009/9/12
@@ -398,7 +398,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 
diff --git a/test/test_addwstr.c b/test/test_addwstr.c
index e4e90579..aa7bf857 100644
--- a/test/test_addwstr.c
+++ b/test/test_addwstr.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_addwstr.c,v 1.20 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_addwstr.c,v 1.21 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the waddwstr() and wadd_wch functions.
  * Thomas Dickey - 2009/9/12
@@ -490,7 +490,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
 
diff --git a/test/test_arrays.c b/test/test_arrays.c
index ef276703..f89cb280 100644
--- a/test/test_arrays.c
+++ b/test/test_arrays.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_arrays.c,v 1.12 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_arrays.c,v 1.13 2022/12/10 23:23:27 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -217,7 +217,7 @@ main(int argc, char *argv[])
 
 #else
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     printf("This program requires the terminfo arrays\n");
     ExitProgram(EXIT_FAILURE);
@@ -225,7 +225,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 #endif
 #else /* !HAVE_TIGETSTR */
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     printf("This program requires the terminfo functions such as tigetstr\n");
     ExitProgram(EXIT_FAILURE);
diff --git a/test/test_delwin.c b/test/test_delwin.c
index 450dad1e..7a874251 100644
--- a/test/test_delwin.c
+++ b/test/test_delwin.c
@@ -27,7 +27,7 @@
  ****************************************************************************/
 
 /*
- * $Id: test_delwin.c,v 1.3 2022/08/14 00:12:52 tom Exp $
+ * $Id: test_delwin.c,v 1.4 2022/12/10 22:14:07 tom Exp $
  */
 #include 
 
@@ -53,11 +53,45 @@ next_step(WINDOW *win)
     }
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_delwin [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(void)
+main(int argc, char **argv)
 {
     WINDOW *parent, *child1;
     int rc;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
     if ((my_screen = newterm(NULL, stdout, stdin)) == NULL)
 	ExitProgram(EXIT_FAILURE);
diff --git a/test/test_get_wstr.c b/test/test_get_wstr.c
index bc86030c..2a788fce 100644
--- a/test/test_get_wstr.c
+++ b/test/test_get_wstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2022 Thomas E. Dickey                                     *
  * Copyright 2007-2011,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_get_wstr.c,v 1.12 2020/02/02 23:34:34 tom Exp $
+ * $Id: test_get_wstr.c,v 1.14 2022/12/10 23:59:13 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -355,18 +355,48 @@ recursive_test(int level, char **argv, WINDOW *strwin)
     return TRUE;
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_get_wstr [options] [file1 [...]]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
     WINDOW *chrbox;
     WINDOW *strwin;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
 
     setlocale(LC_ALL, "");
 
-    if (argc < 2) {
-	fprintf(stderr, "usage: %s file\n", argv[0]);
-	return EXIT_FAILURE;
-    }
+    if (optind + 1 > argc)
+	usage(FALSE);
 
     initscr();
 
@@ -376,7 +406,7 @@ main(int argc, char *argv[])
 
     strwin = derwin(chrbox, 4, COLS - 2, 1, 1);
 
-    recursive_test(1, argv, strwin);
+    recursive_test(optind, argv, strwin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/test_getstr.c b/test/test_getstr.c
index 0910a041..dbc0a0a2 100644
--- a/test/test_getstr.c
+++ b/test/test_getstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2022 Thomas E. Dickey                                     *
  * Copyright 2007-2012,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_getstr.c,v 1.14 2020/02/02 23:34:34 tom Exp $
+ * $Id: test_getstr.c,v 1.16 2022/12/10 23:58:37 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -362,18 +362,48 @@ recursive_test(int level, char **argv, WINDOW *strwin)
     return TRUE;
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_getstr [options] [file1 [...]]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
     WINDOW *chrbox;
     WINDOW *strwin;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
 
     setlocale(LC_ALL, "");
 
-    if (argc < 2) {
-	fprintf(stderr, "usage: %s file\n", argv[0]);
-	return EXIT_FAILURE;
-    }
+    if (optind + 1 > argc)
+	usage(FALSE);
 
     initscr();
 
@@ -383,7 +413,7 @@ main(int argc, char *argv[])
 
     strwin = derwin(chrbox, 4, COLS - 2, 1, 1);
 
-    recursive_test(1, argv, strwin);
+    recursive_test(optind, argv, strwin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/test_instr.c b/test/test_instr.c
index f04d8a3d..c87bdd70 100644
--- a/test/test_instr.c
+++ b/test/test_instr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2022 Thomas E. Dickey                                     *
  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_instr.c,v 1.10 2020/02/02 23:34:34 tom Exp $
+ * $Id: test_instr.c,v 1.12 2022/12/10 23:58:01 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -232,19 +232,49 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     return TRUE;
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_instr [options] [file1 [...]]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
     WINDOW *chrbox;
     WINDOW *chrwin;
     WINDOW *strwin;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
 
     setlocale(LC_ALL, "");
 
-    if (argc < 2) {
-	fprintf(stderr, "usage: %s file\n", argv[0]);
-	return EXIT_FAILURE;
-    }
+    if (optind + 1 > argc)
+	usage(FALSE);
 
     initscr();
 
@@ -255,7 +285,7 @@ main(int argc, char *argv[])
     chrwin = derwin(chrbox, 2, COLS - 2, 1, 1);
     strwin = derwin(chrbox, 2, COLS - 2, 3, 1);
 
-    recursive_test(1, argv, chrwin, strwin);
+    recursive_test(optind, argv, chrwin, strwin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/test_inwstr.c b/test/test_inwstr.c
index 81ebda77..c22add7b 100644
--- a/test/test_inwstr.c
+++ b/test/test_inwstr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2022 Thomas E. Dickey                                     *
  * Copyright 2007-2010,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_inwstr.c,v 1.6 2020/02/02 23:34:34 tom Exp $
+ * $Id: test_inwstr.c,v 1.8 2022/12/10 23:56:39 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -232,19 +232,49 @@ recursive_test(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
     return TRUE;
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_inwstr [options] [file1 [...]]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
     WINDOW *chrbox;
     WINDOW *chrwin;
     WINDOW *strwin;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
 
     setlocale(LC_ALL, "");
 
-    if (argc < 2) {
-	fprintf(stderr, "usage: %s file\n", argv[0]);
-	return EXIT_FAILURE;
-    }
+    if (optind + 1 > argc)
+	usage(FALSE);
 
     initscr();
 
@@ -255,7 +285,7 @@ main(int argc, char *argv[])
     chrwin = derwin(chrbox, 2, COLS - 2, 1, 1);
     strwin = derwin(chrbox, 2, COLS - 2, 3, 1);
 
-    recursive_test(1, argv, chrwin, strwin);
+    recursive_test(optind, argv, chrwin, strwin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/test_opaque.c b/test/test_opaque.c
index c365ba5c..09b98c00 100644
--- a/test/test_opaque.c
+++ b/test/test_opaque.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020,2021 Thomas E. Dickey                                     *
+ * Copyright 2020-2021,2022 Thomas E. Dickey                                *
  * Copyright 2007-2008,2009 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_opaque.c,v 1.14 2021/09/11 23:44:07 tom Exp $
+ * $Id: test_opaque.c,v 1.15 2022/12/11 00:03:10 tom Exp $
  *
  * Author: Thomas E Dickey
  *
@@ -454,18 +454,48 @@ test_set_tabsize(void)
     set_tabsize(save_tabsize);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_opaque [options] file1 [file2 [...]]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
     WINDOW *stsbox;
     WINDOW *stswin;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
 
     setlocale(LC_ALL, "");
 
-    if (argc < 2) {
-	fprintf(stderr, "usage: %s file\n", argv[0]);
-	return EXIT_FAILURE;
-    }
+    if (optind + 1 > argc)
+	usage(FALSE);
 
     initscr();
 
@@ -479,7 +509,7 @@ main(int argc, char *argv[])
     stswin = derwin(stsbox, BASE_Y - 2, COLS - 2, 1, 1);
     keypad(stswin, TRUE);
 
-    test_opaque(1, argv, stswin);
+    test_opaque(optind, argv, stswin);
 
     endwin();
     ExitProgram(EXIT_SUCCESS);
diff --git a/test/test_setupterm.c b/test/test_setupterm.c
index 360a25a3..4e53c2e7 100644
--- a/test/test_setupterm.c
+++ b/test/test_setupterm.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_setupterm.c,v 1.15 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_setupterm.c,v 1.16 2022/12/10 23:23:27 tom Exp $
  *
  * A simple demo of setupterm/restartterm.
  */
@@ -258,7 +258,7 @@ main(int argc, char *argv[])
 
 #else /* !HAVE_TIGETSTR */
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     printf("This program requires the terminfo functions such as tigetstr\n");
     ExitProgram(EXIT_FAILURE);
diff --git a/test/test_sgr.c b/test/test_sgr.c
index 385762a5..dbd1caf1 100644
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.20 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_sgr.c,v 1.21 2022/12/10 23:23:27 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
@@ -384,7 +384,7 @@ main(int argc, char *argv[])
 
 #else /* !HAVE_TIGETSTR */
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     failed("This program requires the terminfo functions such as tigetstr");
     ExitProgram(EXIT_FAILURE);
diff --git a/test/test_termattrs.c b/test/test_termattrs.c
index f5e95db1..ec44cc22 100644
--- a/test/test_termattrs.c
+++ b/test/test_termattrs.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_termattrs.c,v 1.7 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_termattrs.c,v 1.8 2022/12/10 23:23:27 tom Exp $
  *
  * Demonstrate the termattrs and term_attrs functions.
  */
@@ -143,7 +143,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
     bool no_init = FALSE;
@@ -199,8 +199,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 #else
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(void)
 {
     fprintf(stderr, "This program requires terminfo\n");
     exit(EXIT_FAILURE);
diff --git a/test/test_tparm.c b/test/test_tparm.c
index dddec7c3..c242ff68 100644
--- a/test/test_tparm.c
+++ b/test/test_tparm.c
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_tparm.c,v 1.23 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_tparm.c,v 1.24 2022/12/10 23:23:27 tom Exp $
  *
  * Exercise tparm, either for all possible capabilities with fixed parameters,
  * or one capability with all possible parameters.
@@ -490,7 +490,7 @@ main(int argc, char *argv[])
 
 #else /* !HAVE_TIGETSTR */
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(void)
 {
     failed("This program requires the terminfo functions such as tigetstr");
 }
diff --git a/test/test_unget_wch.c b/test/test_unget_wch.c
index b0b340fc..58085304 100644
--- a/test/test_unget_wch.c
+++ b/test/test_unget_wch.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_unget_wch.c,v 1.3 2022/04/16 17:04:04 tom Exp $
+ * $Id: test_unget_wch.c,v 1.4 2022/12/10 23:31:31 tom Exp $
  *
  * Demonstrate the unget_wch and unget functions.
  */
@@ -34,10 +34,44 @@
 #include 
 
 #if USE_WIDEC_SUPPORT && HAVE_UNGET_WCH
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: test_unget_wch [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(void)
+main(int argc, char *argv[])
 {
     int step = 0;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
     setlocale(LC_ALL, "");
     initscr();
diff --git a/test/test_vid_puts.c b/test/test_vid_puts.c
index 5a08d907..0d7d7abb 100644
--- a/test/test_vid_puts.c
+++ b/test/test_vid_puts.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_vid_puts.c,v 1.16 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_vid_puts.c,v 1.17 2022/12/10 22:28:50 tom Exp $
  *
  * Demonstrate the vid_puts and vid_attr functions.
  * Thomas Dickey - 2013/01/12
@@ -116,7 +116,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
     bool no_init = FALSE;
diff --git a/test/test_vidputs.c b/test/test_vidputs.c
index d7bbfcb2..31dc9da4 100644
--- a/test/test_vidputs.c
+++ b/test/test_vidputs.c
@@ -27,7 +27,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: test_vidputs.c,v 1.14 2022/12/04 00:40:11 tom Exp $
+ * $Id: test_vidputs.c,v 1.15 2022/12/10 23:23:27 tom Exp $
  *
  * Demonstrate the vidputs and vidattr functions.
  * Thomas Dickey - 2013/01/12
@@ -116,7 +116,7 @@ VERSION_COMMON()
 /* *INDENT-ON* */
 
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
     bool no_init = FALSE;
@@ -157,8 +157,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 #else
 int
-main(int argc GCC_UNUSED,
-     char *argv[]GCC_UNUSED)
+main(void)
 {
     fprintf(stderr, "This program requires terminfo\n");
     exit(EXIT_FAILURE);
diff --git a/test/testaddch.c b/test/testaddch.c
index 875c8be7..e393c3cc 100644
--- a/test/testaddch.c
+++ b/test/testaddch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 2020,2022 Thomas E. Dickey                                     *
  * Copyright 1998-2013,2014 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
  * This is an example written by Alexander V. Lukyanov ,
  * to demonstrate an inconsistency between ncurses and SVr4 curses.
  *
- * $Id: testaddch.c,v 1.13 2020/02/02 23:34:34 tom Exp $
+ * $Id: testaddch.c,v 1.15 2022/12/10 23:44:18 tom Exp $
  */
 #include 
 
@@ -41,13 +41,45 @@ attr_addstr(const char *s, chtype a)
 	addch(((unsigned char) (*s++)) | a);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: testaddch [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(
-	int argc GCC_UNUSED,
-	char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     unsigned i;
     chtype back, set, attr;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
     setlocale(LC_ALL, "");
 
diff --git a/test/testcurs.c b/test/testcurs.c
index 2e014159..a1dc51ac 100644
--- a/test/testcurs.c
+++ b/test/testcurs.c
@@ -6,7 +6,7 @@
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *
- * $Id: testcurs.c,v 1.56 2021/03/27 22:39:50 tom Exp $
+ * $Id: testcurs.c,v 1.57 2022/12/10 23:35:36 tom Exp $
  */
 
 #include 
@@ -676,16 +676,48 @@ display_menu(int old_option, int new_option)
     refresh();
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: testcurs [options]"
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(
-	int argc GCC_UNUSED,
-	char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     WINDOW *win;
     int old_option = (-1);
     int new_option = 0;
     bool quit = FALSE;
     int n;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
+    if (optind < argc)
+	usage(FALSE);
 
     setlocale(LC_ALL, "");
 
diff --git a/test/testscanw.c b/test/testscanw.c
index 251c464d..415250c6 100644
--- a/test/testscanw.c
+++ b/test/testscanw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2019,2020 Thomas E. Dickey                                     *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
  * Copyright 1998-2002,2006 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,15 +30,49 @@
  * Date:  1997/03/17
  * From:  bayern@morpheus.cis.yale.edu
  *
- * $Id: testscanw.c,v 1.13 2020/02/02 23:34:34 tom Exp $
+ * $Id: testscanw.c,v 1.15 2022/12/11 00:10:29 tom Exp $
  */
 #include 
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+	"Usage: testscanw [options] tokens"
+	,""
+	,"Tokens are integers (starting line-number) or k+, k- to turn keypad on/off."
+	,""
+	,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+	fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
     long badanswer = 1;
     long *response = &badanswer;
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+	switch (ch) {
+	case OPTS_VERSION:
+	    show_version(argv);
+	    ExitProgram(EXIT_SUCCESS);
+	default:
+	    usage(ch == OPTS_USAGE);
+	    /* NOTREACHED */
+	}
+    }
 
     setlocale(LC_ALL, "");
 
@@ -50,12 +84,14 @@ main(int argc, char *argv[])
 #if 0
     curses_trace(TRACE_UPDATE | TRACE_CALLS);
 #endif
-    while (argc > 1) {
-	if (isdigit(UChar(*argv[1])))
-	    move(atoi(argv[1]), 0);
-	else if (!strcmp(argv[1], "-k"))
+    while (optind < argc) {
+	char *token = argv[optind++];
+	if (isdigit(UChar(*token)))
+	    move(atoi(token), 0);
+	else if (!strcmp(token, "k+"))
 	    keypad(stdscr, TRUE);
-	argc--, argv++;
+	else if (!strcmp(token, "k-"))
+	    keypad(stdscr, FALSE);
     }
 
     while (badanswer) {
-- 
2.45.0