[xsrc/netbsd-9]: xsrc/external/mit/xsm/dist Pull up following revision(s) (re...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/e79da798cfb9
branches:  netbsd-9
changeset: 10568:e79da798cfb9
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 08 15:52:11 2020 +0000

description:
Pull up following revision(s) (requested by nia in ticket #1099-x.req):

        external/mit/xdm/dist/config/Xsession.in: revision 1.2
        external/mit/xdm/dist/config/Xsession.in: revision 1.3
        external/mit/xdm/dist/config/Xsession.in: revision 1.4
        external/mit/xdm/dist/config/Xsession.in: revision 1.5
        external/mit/xinit/dist/xinitrc.cpp: revision 1.5
        external/mit/xinit/dist/xinitrc.cpp: revision 1.6
        external/mit/xsm/dist/system.xsm: revision 1.2
        external/mit/xinit/dist/xinitrc.cpp: revision 1.7

make the default xinitrc a bit nicer

spawn only one xterm in unicode mode and use ctwm instead of twm
ctwm is a backwards compatible fork of twm that includes some extra
features like virtual desktops

spawn ctwm in the default xdm Xsession

turn off the ctwm "welcome" screen
while this is nice for Branding(tm), it adds a slight delay to startup,
which is slightly annoying, and a departure from how we've done things
previously.

update the default xsm session to ctwm/uxterm

remove redundant $

Slightly nicer default colors for various X11 apps

diffstat:

 external/mit/xdm/dist/config/Xsession.in |  11 ++++++++++-
 external/mit/xinit/dist/xinitrc.cpp      |  15 ++++++++++-----
 external/mit/xsm/dist/system.xsm         |   6 +++---
 3 files changed, 23 insertions(+), 9 deletions(-)

diffs (60 lines):

diff -r 05973589eb73 -r e79da798cfb9 external/mit/xdm/dist/config/Xsession.in
--- a/external/mit/xdm/dist/config/Xsession.in  Thu Aug 27 08:53:19 2020 +0000
+++ b/external/mit/xdm/dist/config/Xsession.in  Thu Oct 08 15:52:11 2020 +0000
@@ -61,6 +61,15 @@
 else
        if [ -r "$resources" ]; then
                BINDIR/xrdb -load "$resources"
+       else
+               BINDIR/xrdb -load - <<EOF
+#if COLOR
+*customization: -color
+*VT100.foreground: grey90
+*VT100.background: black
+#endif
+EOF
        fi
-       exec BINDIR/xsm
+       BINDIR/uxterm &
+       exec BINDIR/ctwm -W
 fi
diff -r 05973589eb73 -r e79da798cfb9 external/mit/xinit/dist/xinitrc.cpp
--- a/external/mit/xinit/dist/xinitrc.cpp       Thu Aug 27 08:53:19 2020 +0000
+++ b/external/mit/xinit/dist/xinitrc.cpp       Thu Oct 08 15:52:11 2020 +0000
@@ -33,6 +33,14 @@
 #else
     XRDB -merge "$userresources"
 #endif
+else
+    XRDB -merge - <<EOF
+#if COLOR
+*customization: -color
+*VT100.foreground: grey90
+*VT100.background: black
+#endif
+EOF
 fi
 
 if [ -f "$usermodmap" ]; then
@@ -48,8 +56,5 @@
        unset f
 fi
 
-TWM &
-XCLOCK -geometry 50x50-1+1 &
-XTERM -geometry 80x50+494+51 &
-XTERM -geometry 80x20+494-0 &
-exec XTERM -geometry 80x66+0+0 -name login
+UXTERM &
+exec CTWM -W
diff -r 05973589eb73 -r e79da798cfb9 external/mit/xsm/dist/system.xsm
--- a/external/mit/xsm/dist/system.xsm  Thu Aug 27 08:53:19 2020 +0000
+++ b/external/mit/xsm/dist/system.xsm  Thu Oct 08 15:52:11 2020 +0000
@@ -1,4 +1,4 @@
-! $Xorg: system.xsm,v 1.3 2000/08/17 19:55:06 cpqbld Exp $
-twm
+! $NetBSD: system.xsm,v 1.1.1.1.26.1 2020/10/08 15:52:11 martin Exp $
+ctwm
 smproxy
-xterm
+uxterm