Module Name: xsrc
Committed By: nia
Date: Sun May 29 12:40:36 UTC 2022
Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
Expand and escape comments. One minor change to variable expansion
as requested by uwe.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.21 -r1.22 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.19 xsrc/external/mit/xdm/dist/config/Xsession.in:1.20
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.19 Sun May 29 06:06:14 2022
+++ xsrc/external/mit/xdm/dist/config/Xsession.in Sun May 29 12:40:36 2022
@@ -1,6 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
-XHASH $NetBSD: Xsession.in,v 1.19 2022/05/29 06:06:14 nia Exp $
+XHASH $NetBSD: Xsession.in,v 1.20 2022/05/29 12:40:36 nia Exp $
XCOMM redirect errors to a file in user's home directory if we can
@@ -93,23 +93,26 @@ Xmessage*font: -*-spleen-medium-r-*-*-$
Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
EOF
if [ $fontsize -gt 18 ]; then
-#
-# For HiDPI displays, the font size returned by ctwm_font_size will
-# generally be a multiple of 16. 96 is our standard DPI, and many
-# applications want to scale by integer increments or don't handle
-# non-integer scaling gracefully, so we want to scale by multiples
-# of 96.
-#
+XCOMM
+XCOMM For HiDPI displays, the font size returned by ctwm_font_size will
+XCOMM generally be a multiple of 16. 96 is our standard DPI, and many
+XCOMM applications want to scale by integer increments or don't handle
+XCOMM non-integer scaling gracefully, so we want to scale by multiples
+XCOMM of 96.
+XCOMM
BINDIR/xrdb -merge - <<EOF
-Xft.dpi: $((96 * ($fontsize / 16)))
+Xft.dpi: $((96 * (fontsize / 16)))
*VT100.faceName: xft:Monospace:pixelsize=$fontsize
EOF
elif [ $fontsize -gt 13 ]; then
-#
-# For non-HiDPI cases, use the standard misc-fixed font in xterm
-# since it has bold variants, and seems to have caused fewer
-# complaints than alternatives in the community so far.
-#
+XCOMM
+XCOMM For non-HiDPI cases, use the standard misc-fixed font in xterm
+XCOMM since it has bold variants, and seems to have caused fewer
+XCOMM complaints than alternatives in the community so far.
+XCOMM
+XCOMM Using bitmap instead of TrueType fonts offers us some minor
+XCOMM performance gains on very slow machines.
+XCOMM
BINDIR/xrdb -merge - <<EOF
*VT100.font: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso10646-1
*VT100.fontBold: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso10646-1
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.21 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.22
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.21 Sun May 29 06:06:13 2022
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Sun May 29 12:40:36 2022
@@ -1,5 +1,5 @@
XCOMM!SHELL_CMD
-XHASH $NetBSD: xinitrc.cpp,v 1.21 2022/05/29 06:06:13 nia Exp $
+XHASH $NetBSD: xinitrc.cpp,v 1.22 2022/05/29 12:40:36 nia Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@@ -64,23 +64,26 @@ Xmessage*font: -*-spleen-medium-r-*-*-$
Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
EOF
if [ $fontsize -gt 18 ]; then
-#
-# For HiDPI displays, the font size returned by ctwm_font_size will
-# generally be a multiple of 16. 96 is our standard DPI, and many
-# applications want to scale by integer increments or don't handle
-# non-integer scaling gracefully, so we want to scale by multiples
-# of 96.
-#
+XCOMM
+XCOMM For HiDPI displays, the font size returned by ctwm_font_size will
+XCOMM generally be a multiple of 16. 96 is our standard DPI, and many
+XCOMM applications want to scale by integer increments or don't handle
+XCOMM non-integer scaling gracefully, so we want to scale by multiples
+XCOMM of 96.
+XCOMM
XRDB -merge - <<EOF
-Xft.dpi: $((96 * ($fontsize / 16)))
+Xft.dpi: $((96 * (fontsize / 16)))
*VT100.faceName: xft:Monospace:pixelsize=$fontsize
EOF
elif [ $fontsize -gt 13 ]; then
-#
-# For non-HiDPI cases, use the standard misc-fixed font in xterm
-# since it has bold variants, and seems to have caused fewer
-# complaints than alternatives in the community so far.
-#
+XCOMM
+XCOMM For non-HiDPI cases, use the standard misc-fixed font in xterm
+XCOMM since it has bold variants, and seems to have caused fewer
+XCOMM complaints than alternatives in the community so far.
+XCOMM
+XCOMM Using bitmap instead of TrueType fonts offers us some minor
+XCOMM performance gains on very slow machines.
+XCOMM
XRDB -merge - <<EOF
*VT100.font: -misc-fixed-medium-r-normal-*-18-*-*-*-*-*-iso10646-1
*VT100.fontBold: -misc-fixed-bold-r-normal-*-18-*-*-*-*-*-iso10646-1
