Module Name: xsrc
Committed By: nia
Date: Sun May 8 08:17:06 UTC 2022
Modified Files:
xsrc/external/mit/xdm/dist/config: Xsession.in
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
want more default xorg font resource definitions,
and a clock on ctwm startup
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/xdm/dist/config/Xsession.in
cvs rdiff -u -r1.13 -r1.14 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.10 xsrc/external/mit/xdm/dist/config/Xsession.in:1.11
--- xsrc/external/mit/xdm/dist/config/Xsession.in:1.10 Sat Dec 25 11:37:25 2021
+++ xsrc/external/mit/xdm/dist/config/Xsession.in Sun May 8 08:17:06 2022
@@ -1,5 +1,6 @@
XCOMM!SHELL_CMD
XCOMM
+XHASH $NetBSD: Xsession.in,v 1.11 2022/05/08 08:17:06 nia Exp $
XCOMM redirect errors to a file in user's home directory if we can
@@ -93,10 +94,17 @@ 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
fi
BINDIR/xsetroot -cursor_name left_ptr
BINDIR/xsetroot -solid 'rgb:00/22/44'
BINDIR/uxterm &
+ BINDIR/xclock -digital -strftime '%a %Y-%m-%d %H:%M' \
+ -face "spleen:pixelsize=$fontsize" -g +0+0 &
exec BINDIR/ctwm -W
fi
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.13 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.14
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.13 Wed Dec 29 16:01:58 2021
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Sun May 8 08:17:06 2022
@@ -1,4 +1,5 @@
XCOMM!SHELL_CMD
+XHASH $NetBSD: xinitrc.cpp,v 1.14 2022/05/08 08:17:06 nia Exp $
userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap
@@ -62,6 +63,11 @@ 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
fi
@@ -80,5 +86,7 @@ fi
XSETROOT -cursor_name left_ptr
XSETROOT -solid 'rgb:00/22/44'
+XCLOCK -digital -strftime '%a %Y-%m-%d %H:%M' \
+ -face "spleen:pixelsize=$fontsize" -g +0+0 &
UXTERM &
exec CTWM -W
