Module Name: xsrc
Committed By: nia
Date: Mon May 9 07:00:15 UTC 2022
Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
Default X session: In xterm and xman at lower DPIs, use misc-fixed
instead of spleen for greater readability. Reasoning: misc-fixed
has native bold variants.
At higher DPIs, xterm can suitably 'enbolden' spleen without losing
significant aspects of the letter shape, so the text remains readable.
Requested by uwe and jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.15 -r1.16 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.12 xsrc/external/mit/xdm/dist/config/Xsession.in:1.13
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.12 Sun May 8 09:09:58 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in Mon May 9 07:00:15 2022
@@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
-XHASH $NetBSD: Xsession.in,v 1.12 2022/05/08 09:09:58 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.13 2022/05/09 07:00:15 nia Exp $
XCOMM redirect errors to a file in user's home directory if we can
@@ -77,25 +77,6 @@ else
#endif
*VT100.foreground: grey90
*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-*-*-*-*-*-*-*
@@ -116,6 +97,55 @@ Xman*manualFontBold: -*-spleen-medium-r-
Xman*manualFontItalic: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
Xman*directoryFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
EOF
+if [ $fontsize -gt 18 ]; then
+ BINDIR/xrdb -merge - <<EOF
+*VT100.font: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font: -*-spleen-*-*-*-*-$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-*-*-*-*-*-*-*
+Xman*font: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*directoryFontNormal: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontNormal: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontBold: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontItalic: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+EOF
+elif [ $fontsize -gt 13 ]; then
+ BINDIR/xrdb -merge - <<EOF
+*VT100.font: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso10646-1
+*VT100.fontBold: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso10646-1
+*VT100.utf8Fonts.font: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso10646-1
+*VT100.utf8Fonts.fontBold: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso10646-1
+Xman*font: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso8859-1
+Xman*directoryFontNormal: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso8859-1
+Xman*manualFontNormal: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso8859-1
+Xman*manualFontBold: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso8859-1
+Xman*manualFontItalic: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso8859-1
+EOF
+else
+ BINDIR/xrdb -merge - <<EOF
+*VT100.font: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso10646-1
+*VT100.fontBold: -misc-fixed-bold-r-normal-*-13-*-*-*-*-*-iso10646-1
+*VT100.utf8Fonts.font: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso10646-1
+*VT100.utf8Fonts.fontBold: -misc-fixed-bold-r-normal-*-13-*-*-*-*-*-iso10646-1
+Xman*font: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso8859-1
+Xman*directoryFontNormal: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso8859-1
+Xman*manualFontNormal: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso8859-1
+Xman*manualFontBold: -misc-fixed-bold-r-normal-*-13-*-*-*-*-*-iso8859-1
+Xman*manualFontItalic: -misc-fixed-medium-o-normal-*-13-*-*-*-*-*-iso8859-1
+EOF
+fi
fi
BINDIR/xsetroot -cursor_name left_ptr
BINDIR/xsetroot -solid 'rgb:00/22/44'
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.15 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.16
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.15 Sun May 8 09:09:58 2022
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Mon May 9 07:00:15 2022
@@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
-XHASH $NetBSD: xinitrc.cpp,v 1.15 2022/05/08 09:09:58 nia Exp $
+XHASH $NetBSD: xinitrc.cpp,v 1.16 2022/05/09 07:00:15 nia Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@@ -46,25 +46,6 @@ XHASH ifdef COLOR
XHASH endif
*VT100.foreground: grey90
*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-*-*-*-*-*-*-*
@@ -81,12 +62,56 @@ Xgc*font: -*-spleen-medium-r-*-*-$
Xmag*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
Xmessage*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*manualFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*manualFontBold: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*manualFontItalic: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
-Xman*directoryFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
EOF
+if [ $fontsize -gt 18 ]; then
+ XRDB -merge - <<EOF
+*VT100.font: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font: -*-spleen-*-*-*-*-$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-*-*-*-*-*-*-*
+Xman*font: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*directoryFontNormal: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontNormal: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontBold: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+Xman*manualFontItalic: -*-spleen-*-*-*-*-$fontsize-*-*-*-*-*-*-*
+EOF
+elif [ $fontsize -gt 13 ]; then
+ XRDB -merge - <<EOF
+*VT100.font: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso10646-1
+*VT100.fontBold: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso10646-1
+*VT100.utf8Fonts.font: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso10646-1
+*VT100.utf8Fonts.fontBold: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso10646-1
+Xman*font: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso8859-1
+Xman*directoryFontNormal: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso8859-1
+Xman*manualFontNormal: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso8859-1
+Xman*manualFontBold: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso8859-1
+Xman*manualFontItalic: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso8859-1
+EOF
+else
+ XRDB -merge - <<EOF
+*VT100.font: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso10646-1
+*VT100.fontBold: -misc-fixed-bold-r-normal-*-13-*-*-*-*-*-iso10646-1
+*VT100.utf8Fonts.font: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso10646-1
+*VT100.utf8Fonts.fontBold: -misc-fixed-bold-r-normal-*-13-*-*-*-*-*-iso10646-1
+Xman*font: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso8859-1
+Xman*directoryFontNormal: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso8859-1
+Xman*manualFontNormal: -misc-fixed-medium-r-normal-*-13-*-*-*-*-*-iso8859-1
+Xman*manualFontBold: -misc-fixed-bold-r-normal-*-13-*-*-*-*-*-iso8859-1
+Xman*manualFontItalic: -misc-fixed-medium-o-normal-*-13-*-*-*-*-*-iso8859-1
+EOF
+fi
fi
if [ -f "$usermodmap" ]; then
