[xsrc/trunk]: xsrc/external/mit/xinit/dist Scale XTerm and other X11 apps usi...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/9a563447aed0
branches:  trunk
changeset: 10575:9a563447aed0
user:      nia <nia%NetBSD.org@localhost>
date:      Mon Oct 12 12:11:55 2020 +0000

description:
Scale XTerm and other X11 apps using the same DPI detection as ctwm

diffstat:

 external/mit/xdm/dist/config/Xsession.in |  22 ++++++++++++++++++++++
 external/mit/xinit/dist/xinitrc.cpp      |  22 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 0 deletions(-)

diffs (78 lines):

diff -r 788750c1e499 -r 9a563447aed0 external/mit/xdm/dist/config/Xsession.in
--- a/external/mit/xdm/dist/config/Xsession.in  Mon Oct 12 11:46:17 2020 +0000
+++ b/external/mit/xdm/dist/config/Xsession.in  Mon Oct 12 12:11:55 2020 +0000
@@ -52,6 +52,11 @@
 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 @@
 *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
diff -r 788750c1e499 -r 9a563447aed0 external/mit/xinit/dist/xinitrc.cpp
--- a/external/mit/xinit/dist/xinitrc.cpp       Mon Oct 12 11:46:17 2020 +0000
+++ b/external/mit/xinit/dist/xinitrc.cpp       Mon Oct 12 12:11:55 2020 +0000
@@ -23,6 +23,11 @@
     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 @@
 *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