Module Name: xsrc
Committed By: nia
Date: Sun May 8 09:09:58 UTC 2022
Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
Make the xterm font size selection menu work in a reasonably expected way
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xinit/dist/xinitrc.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xdm/dist/config/Xsession.in
diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.11 xsrc/external/mit/xdm/dist/config/Xsession.in:1.12
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.11 Sun May 8 08:17:06 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in Sun May 8 09:09:58 2022
@@ -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 @@ else
*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-*-*-*-*-*-*-*
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.15
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14 Sun May 8 08:17:06 2022
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Sun May 8 09:09:58 2022
@@ -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 @@ XHASH endif
*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-*-*-*-*-*-*-*
