Module Name: xsrc
Committed By: nia
Date: Fri May 27 19:05:29 UTC 2022
Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
Only set dpi when necessary to avoid divide by zero on very small screens
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.18 -r1.19 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.16 xsrc/external/mit/xdm/dist/config/Xsession.in:1.17
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.16 Fri May 27 17:58:54 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in Fri May 27 19:05:28 2022
@@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
-XHASH $NetBSD: Xsession.in,v 1.16 2022/05/27 17:58:54 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.17 2022/05/27 19:05:28 nia Exp $
XCOMM redirect errors to a file in user's home directory if we can
@@ -75,7 +75,6 @@ else
#ifdef COLOR
*customization: -color
#endif
-Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
*VT100.foreground: grey90
*VT100.background: black
Bitmap*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
@@ -95,6 +94,7 @@ Xmh*font: -*-spleen-medium-r-*-*-$
EOF
if [ $fontsize -gt 18 ]; then
BINDIR/xrdb -merge - <<EOF
+Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
*VT100.faceName: xft:Monospace:pixelsize=$fontsize
EOF
elif [ $fontsize -gt 13 ]; then
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.18 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.19
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.18 Fri May 27 17:58:54 2022
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Fri May 27 19:05:28 2022
@@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
-XHASH $NetBSD: xinitrc.cpp,v 1.18 2022/05/27 17:58:54 nia Exp $
+XHASH $NetBSD: xinitrc.cpp,v 1.19 2022/05/27 19:05:28 nia Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@@ -44,7 +44,6 @@ else
XHASH ifdef COLOR
*customization: -color
XHASH endif
-Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
*VT100.foreground: grey90
*VT100.background: black
*SimpleMenu*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
@@ -66,6 +65,7 @@ Xmh*font: -*-spleen-medium-r-*-*-$
EOF
if [ $fontsize -gt 18 ]; then
XRDB -merge - <<EOF
+Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin)
*VT100.faceName: xft:Monospace:pixelsize=$fontsize
EOF
elif [ $fontsize -gt 13 ]; then
