[xsrc/trunk]: xsrc/external/mit merge mkfontscale 1.2.2, twm 1.0.12, xauth 1....

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/7a064e5e9f9a
branches:  trunk
changeset: 7046:7a064e5e9f9a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 11 09:13:30 2022 +0000

description:
merge mkfontscale 1.2.2, twm 1.0.12, xauth 1.1.2, and xdm 1.1.13.

diffstat:

 external/mit/mkfontscale/dist/mkfontscale.c |     9 +-
 external/mit/twm/dist/README                |    30 -
 external/mit/twm/dist/man/twm.man           |   864 +++++++++++++-------
 external/mit/twm/dist/src/util.c            |  1131 ++++++++++++++------------
 external/mit/twm/dist/src/util.h            |    83 +-
 external/mit/xauth/dist/process.c           |     4 +-
 external/mit/xauth/dist/tests/test_xauth.c  |    10 -
 external/mit/xdm/dist/compile               |    17 +-
 external/mit/xdm/dist/greeter/Login.c       |    11 +-
 external/mit/xdm/dist/m4/libtool.m4         |   227 +++--
 external/mit/xdm/dist/m4/ltoptions.m4       |     4 +-
 external/mit/xdm/dist/m4/ltsugar.m4         |     2 +-
 external/mit/xdm/dist/m4/ltversion.m4       |    13 +-
 external/mit/xdm/dist/m4/lt~obsolete.m4     |     4 +-
 external/mit/xdm/dist/man/xdm.man           |     2 +-
 external/mit/xdm/dist/xdm/dm.c              |     2 +-
 16 files changed, 1361 insertions(+), 1052 deletions(-)

diffs (truncated from 4241 to 300 lines):

diff -r 00b6330823ea -r 7a064e5e9f9a external/mit/mkfontscale/dist/mkfontscale.c
--- a/external/mit/mkfontscale/dist/mkfontscale.c       Mon Jul 11 09:08:12 2022 +0000
+++ b/external/mit/mkfontscale/dist/mkfontscale.c       Mon Jul 11 09:13:30 2022 +0000
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -443,9 +444,9 @@
         return "light";
     if(strcasecmp(weight, "Regular") == 0)
         return "medium";
-    if(strcasecmp(weight, "Plain") == 0)
+    if(strcasecmp(weight, "Normal") == 0)
         return "medium";
-    if(strcasecmp(weight, "Normal") == 0)
+    if(strcasecmp(weight, "Plain") == 0)
         return "medium";
     if(strcasecmp(weight, "Medium") == 0)
         return "medium";
@@ -461,9 +462,9 @@
         return "semibold";
     else if(strcasecmp(weight, "Bold") == 0)
         return "bold";
-    else if(strcasecmp(weight, "Heavy") == 0) /* FontForge uses this for 800*/
+    else if(strcasecmp(weight, "ExtraBold") == 0) /* freefonts uses this */
         return "extrabold";
-    else if(strcasecmp(weight, "ExtraBold") == 0) /* freefonts uses this */
+    else if(strcasecmp(weight, "Heavy") == 0) /* FontForge uses this for 800*/
         return "extrabold";
     else if(strcasecmp(weight, "Black") == 0)
         return "black";
diff -r 00b6330823ea -r 7a064e5e9f9a external/mit/twm/dist/README
--- a/external/mit/twm/dist/README      Mon Jul 11 09:08:12 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-twm - Tab Window Manager for the X Window System
-
-twm is a window manager for the X Window System.  It provides
-titlebars, shaped windows, several forms of icon management,
-user-defined macro functions, click-to-type and pointer-driven
-keyboard focus, and user-specified key and pointer button bindings.
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
-        http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
-        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
-        git://anongit.freedesktop.org/git/xorg/app/twm
-
-        http://cgit.freedesktop.org/xorg/app/twm
-
-For patch submission instructions, see:
-
-       http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
-        http://wiki.x.org/wiki/GitPage
-
diff -r 00b6330823ea -r 7a064e5e9f9a external/mit/twm/dist/man/twm.man
--- a/external/mit/twm/dist/man/twm.man Mon Jul 11 09:08:12 2022 +0000
+++ b/external/mit/twm/dist/man/twm.man Mon Jul 11 09:13:30 2022 +0000
@@ -24,42 +24,49 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.de EX          \"Begin example
-.ne 5
-.if n .sp 1
-.if t .sp .5
+.de Ex
+.RS +7
+.PP
 .nf
-.in +.5i
+.ft CW
 ..
-.de EE
+.de Ee
 .fi
-.in -.5i
-.if n .sp 1
-.if t .sp .5
+.ft R
+.RE
 ..
+.ie \n(.g .ds `` \(lq
+.el       .ds `` ``
+.ie \n(.g .ds '' \(rq
+.el       .ds '' ''
 .TH TWM 1 __xorgversion__
 .SH NAME
 twm \- Tab Window Manager for the X Window System
 .SH SYNTAX
-\fBtwm \fP[ \fB\-display\fP \fIdpy\fP ] [ \fB\-s\fP ]
-[ \fB\-f\fP \fIinitfile\fP ] [ \fB\-v\fP ]
+\fBtwm \fP[ \fIoptions\fP ]
 .SH DESCRIPTION
-\fITwm\fP is a window manager for the X Window System.  It provides
+\fITwm\fP is a window manager for the X Window System.
+It provides
 titlebars, shaped windows,
 several forms of icon management, user-defined macro functions,
 click-to-type and pointer-driven keyboard focus, and user-specified
 key and pointer button bindings.
 .PP
 This program is usually started by the user's session manager or
-startup script.  When used from \fIxdm(__appmansuffix__)\fP or \fIxinit(__appmansuffix__)\fP without
-a session manager, \fItwm\fP is frequently executed in the foreground
-as the last client.  When run this way, exiting \fItwm\fP causes the
+startup script.
+When used
+from \fBxdm\fP(__appmansuffix__)
+or \fBxinit\fP(__appmansuffix__) without a session manager,
+\fItwm\fP is frequently executed in the foreground
+as the last client.
+When run this way, exiting \fItwm\fP causes the
 session to be terminated (i.e., logged out).
 .PP
-By default, application windows are surrounded by a ``frame'' with a
-titlebar at the top and a special border around the window.  The titlebar
+By default, application windows are surrounded by a \*(``frame\*('' with a
+titlebar at the top and a special border around the window.
+The titlebar
 contains the window's name, a rectangle that is lit when the window is
-receiving keyboard input, and function boxes known as ``titlebuttons'' at
+receiving keyboard input, and function boxes known as \*(``titlebuttons\*('' at
 the left and right edges of the titlebar.
 .PP
 Pressing pointer Button1 (usually the left-most
@@ -67,7 +74,8 @@
 titlebutton will invoke the function associated with the button.
 In the default interface, windows are iconified by clicking (pressing
 and then immediately releasing) the left titlebutton (which looks
-like a Dot).  Conversely, windows are deiconified by clicking in the
+like a Dot).
+Conversely, windows are deiconified by clicking in the
 associated icon or entry in the icon manager
 (see description of the variable
 \fBShowIconManager\fP and of the function \fBf.showiconmgr\fP).
@@ -75,129 +83,177 @@
 Windows are resized by pressing the right titlebutton (which resembles a
 group of nested squares), dragging the pointer over edge that is to be
 moved, and releasing the pointer when the outline of the window is the desired
-size.  Similarly, windows are moved by pressing in the title or highlight
+size.
+Similarly, windows are moved by pressing in the title or highlight
 region, dragging a window outline to the new location, and then releasing
-when the outline is in the desired position.  Just
+when the outline is in the desired position.
+Just
 clicking in the title or highlight region raises the window without moving it.
 .PP
 When new windows are created, \fItwm\fP will honor any size and location
-information requested by the user (usually through \fI-geometry\fP
+information requested by the user (usually through \fI\-geometry\fP
 command line argument or resources for the individual applications).
 Otherwise, an outline of the window's default size, its titlebar, and lines
 dividing the
 window into a 3x3 grid that track the pointer are displayed.
 Clicking pointer Button1
 will position the window at the current position and give it the default
-size.  Pressing pointer Button2 (usually the middle pointer button)
+size.
+Pressing pointer Button2 (usually the middle pointer button)
 and dragging the outline
 will give the window its current position but allow the sides to be resized as
-described above.  Clicking pointer Button3 (usually the right pointer button)
+described above.
+Clicking pointer Button3 (usually the right pointer button)
 will give the window its current position but attempt to make it long enough
 to touch the bottom the screen.
 .SH OPTIONS
-\fITwm\fP accepts the following command line options:
-.PP
+\fITwm\fP accepts several command line options,
+which may be abbreviated, e.g.,
+\*(``\fB\-d\fP\*('' for
+\*(``\fB\-display\fP\*(''
+(but upper/lower-case are different):
+.TP 8
+.B \-clientId \fIID\fP
+Each time \fItwm\fP starts, it calls
+\fBSmcOpenConnection\fP
+to establish a new session.
+It can be told to restart from a previous session by giving the previous
+session's client-identifier.
 .TP 8
 .B \-display \fIdpy\fP
-This option specifies the X server to use.
+Specify the X server to use.
 .TP 8
-.B \-s
-This option indicates that only the default screen (as specified by
-\fB\-display\fP or by the \fBDISPLAY\fP environment variable) should be
-managed.  By default, \fItwm\fP will attempt to manage
-all screens on the display.
-.TP 8
-.B \-f \fIfilename\fP
-This option specifies the name of the startup file to use.  By default,
+.B \-file \fIfilename\fP
+Specify the name of the startup file to use.
+By default,
 \fItwm\fP will look in the user's home directory for files
 named \fI.twmrc.num\fP (where \fInum\fP is a screen number) or \fI.twmrc\fP.
 .TP 8
-.B \-v
-This option indicates that \fItwm\fP should print error messages whenever
-an unexpected X Error event is received.  This can be useful when debugging
+.B \-quiet
+Tells \fItwm\fP that it should not print error messages when
+it receives unexpected X Error events.
+.IP
+Besides X Error events, \fItwm\fP also reports its own warnings.
+The \fB\-quiet\fP option suppresses those.
+.TP 8
+.B \-restore \fIfilename\fP
+When \fItwm\fP's session is stopped, it attempts to save the current
+window configuration.
+Use this option to tell \fItwm\fP to read this file for that information
+when starting (or restarting) a session.
+.TP 8
+.B \-single
+Tells \fItwm\fP that only the default screen (as specified by
+\fB\-display\fP or by the \fBDISPLAY\fP environment variable) should be
+managed.
+By default, \fItwm\fP will attempt to manage
+all screens on the display.
+.TP 8
+.B \-verbose
+Tells \fItwm\fP that it should print error messages whenever
+it receives an unexpected X Error event.
+This can be useful when debugging
 applications but can be distracting in regular use.
+.IP
+The \fB\-verbose\fP and \fB\-quiet\fP options increment and decrement
+the message level, cancelling each other.
+.TP 8
+.B \-V
+Tell \fItwm\fP to print its version to the standard output, and exit.
 .SH CUSTOMIZATION
-.PP
 Much of \fItwm\fP's appearance and behavior can be controlled by providing
 a startup file in one of the following locations (searched in order for
 each screen being managed when \fItwm\fP begins):
 .TP 8
-.B "$HOME/.twmrc.\fIscreennumber\fP"
-The \fIscreennumber\fP is a small positive number (e.g. 0, 1, etc.)
-representing the screen number (e.g. the last number in the DISPLAY environment
+.B $HOME/.twmrc.\fIscreennumber\fP
+The \fIscreennumber\fP is a small positive number (e.g., 0, 1, etc.)
+representing the screen number
+(e.g., the last number in the DISPLAY environment
 variable \fIhost:displaynum.screennum\fP) that would be used to contact that
-screen of the display.  This is intended for displays with multiple screens of
+screen of the display.
+This is intended for displays with multiple screens of
 differing visual types.
 .TP 8
-.B "$HOME/.twmrc"
+.B $HOME/.twmrc
 This is the usual name for an individual user's startup file.
 .TP 8
 .B __datadir__/X11/twm/system.twmrc
 If neither of the preceding files are found, \fItwm\fP will look in this
 file for a
-default configuration.  This is often tailored by the site administrator to
+default configuration.
+This is often tailored by the site administrator to
 provide convenient menus or familiar bindings for novice users.
 .PP
 If no startup files are found, \fItwm\fP will use the built-in defaults
-described above.  The only resource used by \fItwm\fP is
+described above.
+The only resource used by \fItwm\fP is
 \fIbitmapFilePath\fP for a colon-separated list of directories to search
-when looking for bitmap files (for more information, see the \fIAthena
-Widgets\fP manual and \fIxrdb(__appmansuffix__)\fP).
+when looking for bitmap files (for more information,
+see the \fIAthena Widgets\fP manual and \fBxrdb\fP(__appmansuffix__)).
 .PP
 \fITwm\fP startup files are logically broken up into three types of
-specifications:  \fIVariables\fP, \fIBindings\fP, \fIMenus\fP.  The
+specifications: \fIVariables\fP, \fIBindings\fP, \fIMenus\fP.
+The
 \fIVariables\fP section must come first and is used to describe the
 fonts, colors, cursors, border widths, icon and window placement, highlighting,
 autoraising, layout of titles, warping, use of the icon manager.
 The \fIBindings\fP section usually comes second and is used to specify
 the functions that should be