Module Name: xsrc
Committed By: nia
Date: Fri May 27 14:23:23 UTC 2022
Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
In xterm, use TrueType fonts rather than Spleen at higher DPIs.
Requested by jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.16 -r1.17 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.14 xsrc/external/mit/xdm/dist/config/Xsession.in:1.15
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.14 Mon May 9 09:00:20 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in Fri May 27 14:23:23 2022
@@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
-XHASH $NetBSD: Xsession.in,v 1.14 2022/05/09 09:00:20 uwe Exp $
+XHASH $NetBSD: Xsession.in,v 1.15 2022/05/27 14:23:23 nia Exp $
XCOMM redirect errors to a file in user's home directory if we can
@@ -91,35 +91,10 @@ 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
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-*-*-*-*-*-*-*
+*VT100.faceName: xft:Monospace:pixelsize=$fontsize
EOF
elif [ $fontsize -gt 13 ]; then
BINDIR/xrdb -merge - <<EOF
@@ -127,11 +102,6 @@ elif [ $fontsize -gt 13 ]; then
*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
@@ -139,11 +109,6 @@ else
*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
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.16 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.17
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.16 Mon May 9 07:00:15 2022
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Fri May 27 14:23:23 2022
@@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
-XHASH $NetBSD: xinitrc.cpp,v 1.16 2022/05/09 07:00:15 nia Exp $
+XHASH $NetBSD: xinitrc.cpp,v 1.17 2022/05/27 14:23:23 nia Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@@ -65,27 +65,7 @@ Xmh*font: -*-spleen-medium-r-*-*-$
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-*-*-*-*-*-*-*
+*VT100.faceName: xft:Monospace:pixelsize=$fontsize
EOF
elif [ $fontsize -gt 13 ]; then
XRDB -merge - <<EOF
@@ -93,11 +73,6 @@ elif [ $fontsize -gt 13 ]; then
*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
@@ -105,11 +80,6 @@ else
*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
