Module Name: xsrc
Committed By: nia
Date: Mon Oct 12 12:11:55 UTC 2020
Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
Scale XTerm and other X11 apps using the same DPI detection as ctwm
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.9 -r1.10 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.7 xsrc/external/mit/xdm/dist/config/Xsession.in:1.8
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.7 Mon Oct 12 11:46:17 2020
+++ xsrc/external/mit/xdm/dist/config/Xsession.in Mon Oct 12 12:11:55 2020
@@ -52,6 +52,11 @@ XCOMM The startup script is not intended
startup=$HOME/.xsession
resources=$HOME/.Xresources
+fontsize=$(/usr/X11R7/libexec/ctwm_font_size)
+if ! [ -n "$fontsize" ]; then
+ fontsize=16
+fi
+
if [ -s "$startup" ]; then
if [ -x "$startup" ]; then
exec "$startup"
@@ -68,6 +73,23 @@ else
*VT100.foreground: grey90
*VT100.background: black
#endif
+*VT100.allowBoldFonts: false
+*VT100.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Bitmap*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Editres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Viewres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XCalc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XClipboard*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XConsole*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XFontSel*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XLoad*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xedit*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xfd*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xgc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmag*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmessage*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
EOF
fi
BINDIR/xsetroot -cursor_name left_ptr
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.9 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.10
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.9 Mon Oct 12 11:46:17 2020
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Mon Oct 12 12:11:55 2020
@@ -23,6 +23,11 @@ if [ -f $sysmodmap ]; then
XMODMAP $sysmodmap
fi
+fontsize=$(/usr/X11R7/libexec/ctwm_font_size)
+if ! [ -n "$fontsize" ]; then
+ fontsize=16
+fi
+
if [ -f "$userresources" ]; then
#ifdef __APPLE__
if [ -x /usr/bin/cpp ] ; then
@@ -40,6 +45,23 @@ else
*VT100.foreground: grey90
*VT100.background: black
#endif
+*VT100.allowBoldFonts: false
+*VT100.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+*VT100.utf8Fonts.font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Bitmap*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Editres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Viewres*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XCalc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XClipboard*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XConsole*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XFontSel*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+XLoad*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xedit*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xfd*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xgc*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmag*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmessage*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
+Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
EOF
fi
