[xsrc/trunk]: xsrc/external/mit/xinit/dist Make the xterm font size selection...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/6a542173517a
branches:  trunk
changeset: 6963:6a542173517a
user:      nia <nia%NetBSD.org@localhost>
date:      Sun May 08 09:09:58 2022 +0000

description:
Make the xterm font size selection menu work in a reasonably expected way

diffstat:

 external/mit/xdm/dist/config/Xsession.in |  18 +++++++++++++++++-
 external/mit/xinit/dist/xinitrc.cpp      |  20 +++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diffs (71 lines):

diff -r 8f24c33632cf -r 6a542173517a external/mit/xdm/dist/config/Xsession.in
--- a/external/mit/xdm/dist/config/Xsession.in  Sun May 08 08:17:06 2022 +0000
+++ b/external/mit/xdm/dist/config/Xsession.in  Sun May 08 09:09:58 2022 +0000
@@ -1,6 +1,6 @@
 XCOMM!SHELL_CMD
 XCOMM
-XHASH $NetBSD: Xsession.in,v 1.11 2022/05/08 08:17:06 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.12 2022/05/08 09:09:58 nia Exp $
 
 XCOMM redirect errors to a file in user's home directory if we can
 
@@ -79,7 +79,23 @@
 *VT100.background: black
 *VT100.allowBoldFonts:  false
 *VT100.font:    -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.fontdefault:    -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 *VT100.utf8Fonts.font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.fontdefault:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.font1:  -*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
+*VT100.font2:  -*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
+*VT100.font3:  -*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
+*VT100.font4:  -*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
+*VT100.font5:  -*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
+*VT100.font6:  -*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
+*VT100.font7:  -*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font1:        -*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font2:        -*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font3:        -*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font4:        -*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font5:        -*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font6:        -*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font7:        -*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
 Bitmap*font:    -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Editres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Viewres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
diff -r 8f24c33632cf -r 6a542173517a external/mit/xinit/dist/xinitrc.cpp
--- a/external/mit/xinit/dist/xinitrc.cpp       Sun May 08 08:17:06 2022 +0000
+++ b/external/mit/xinit/dist/xinitrc.cpp       Sun May 08 09:09:58 2022 +0000
@@ -1,5 +1,5 @@
 XCOMM!SHELL_CMD
-XHASH $NetBSD: xinitrc.cpp,v 1.14 2022/05/08 08:17:06 nia Exp $
+XHASH $NetBSD: xinitrc.cpp,v 1.15 2022/05/08 09:09:58 nia Exp $
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
@@ -48,7 +48,25 @@
 *VT100.background: black
 *VT100.allowBoldFonts:  false
 *VT100.font:    -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.fontdefault:    -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 *VT100.utf8Fonts.font:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.fontdefault:  -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.font1:  -*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
+*VT100.font2:  -*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
+*VT100.font3:  -*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
+*VT100.font4:  -*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
+*VT100.font5:  -*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
+*VT100.font6:  -*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
+*VT100.font7:  -*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font1:        -*-spleen-medium-r-*-*-6-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font2:        -*-spleen-medium-r-*-*-8-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font3:        -*-spleen-medium-r-*-*-12-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font4:        -*-spleen-medium-r-*-*-16-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font5:        -*-spleen-medium-r-*-*-24-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font6:        -*-spleen-medium-r-*-*-32-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font7:        -*-spleen-medium-r-*-*-64-*-*-*-*-*-*-*
+*SimpleMenu*font:      -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*SimpleMenu*menuLabel.font:    -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Bitmap*font:    -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Editres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
 Viewres*font:   -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*