CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Tue May 24 14:53:15 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: xdm: Revert font changes. Requested by martin. In addition, we must lower innerFramesWidth to prevent the new-old fonts from causing the two text input boxes to overlap. xdm really could be more clever about text layout... PR xsrc/56855 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.7 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.8 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.7 Sat May 7 06:31:39 2022 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Tue May 24 14:53:15 2022 @@ -1,4 +1,4 @@ -! $NetBSD: Xresources.in,v 1.7 2022/05/07 06:31:39 nia Exp $ +! $NetBSD: Xresources.in,v 1.8 2022/05/24 14:53:15 nia Exp $ xlogin*login.translations: #override BS CtrlR: abort-display()NLBS @@ -22,25 +22,24 @@ xlogin*greetFont: -*-spleen-*-*-*-*-32-* xlogin*font: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* xlogin*promptFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* xlogin*failFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* -xlogin*greetFace: Liberation Sans:pixelsize=32:hintstyle=hintslight -xlogin*face: Liberation Mono:pixelsize=16:hintstyle=hintslight -xlogin*promptFace: Liberation Mono:pixelsize=16:hintstyle=hintslight -xlogin*failFace: Liberation Mono:pixelsize=16:hintstyle=hintslight +xlogin*greetFace: Sans-24:hintstyle=hintslight +xlogin*face: Sans-14:hintstyle=hintslight +xlogin*promptFace: Sans-14:bold:hintstyle=hintslight +xlogin*failFace: Sans-14:bold:hintstyle=hintslight XHASHelse xlogin*greetFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* xlogin*font: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* xlogin*promptFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* xlogin*failFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* -xlogin*greetFace: Liberation Sans:pixelsize=16:hintstyle=hintslight -xlogin*face: Libreation Mono:pixelsize=16:hintstyle=hintslight -xlogin*face: Libreation Mono:pixelsize=16:hintstyle=hintslight -xlogin*promptFace: Libreation Mono:pixelsize=16:hintstyle=hintslight -xlogin*failFace: Libreation Mono:pixelsize=16:hintstyle=hintslight +xlogin*greetFace: Sans-18:hintstyle=hintslight +xlogin*face: Sans-12:hintstyle=hintslight +xlogin*promptFace: Sans-12:bold:hintstyle=hintslight +xlogin*failFace: Sans-14:bold:hintstyle=hintslight XHASHendif xlogin*borderWidth: 2 xlogin*frameWidth: 2 -xlogin*innerFramesWidth: 2 +xlogin*innerFramesWidth: 1 xlogin*sepWidth: 0 XHASHifdef COLOR
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Tue May 24 14:53:15 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: xdm: Revert font changes. Requested by martin. In addition, we must lower innerFramesWidth to prevent the new-old fonts from causing the two text input boxes to overlap. xdm really could be more clever about text layout... PR xsrc/56855 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Sat May 7 06:31:39 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: Add RCSID to Xresources config. Use the B/W NetBSD logo on B/W displays. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.6 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.7 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.6 Thu May 5 15:26:11 2022 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Sat May 7 06:31:39 2022 @@ -1,3 +1,5 @@ +! $NetBSD: Xresources.in,v 1.7 2022/05/07 06:31:39 nia Exp $ + xlogin*login.translations: #override BS CtrlR: abort-display()NLBS F1: set-session-argument(failsafe) finish-field()NLBS @@ -42,6 +44,7 @@ xlogin*innerFramesWidth: 2 xlogin*sepWidth: 0 XHASHifdef COLOR +xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP xlogin*shdColor: steelblue xlogin*hiColor: steelblue xlogin*background: white @@ -49,6 +52,7 @@ xlogin*inpColor: lavender xlogin*greetColor: black xlogin*failColor: darkred XHASHelse +xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP xlogin*shdColor: black xlogin*hiColor: black xlogin*background: white @@ -60,7 +64,6 @@ XHASHendif *Foreground: black *Background: white -xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP xlogin*useShape: true xlogin*logoPadding: 12
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Sat May 7 06:31:39 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: Add RCSID to Xresources config. Use the B/W NetBSD logo on B/W displays. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Thu May 5 15:26:11 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: xdm: Match the default ctwm theme. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.5 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.6 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.5 Mon Oct 26 16:24:09 2020 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Thu May 5 15:26:11 2022 @@ -1,5 +1,3 @@ -Xcursor.theme: whiteglass - xlogin*login.translations: #override BS CtrlR: abort-display()NLBS F1: set-session-argument(failsafe) finish-field()NLBS @@ -18,84 +16,63 @@ xlogin*namePrompt: \040\040\040\040\040\ xlogin*fail: Login incorrect or forbidden by policy XHASHif WIDTH > 800 -xlogin*greetFont: -adobe-helvetica-bold-o-normal-*-18-*-*-*-*-*-iso8859-1 -xlogin*font: -adobe-helvetica-medium-o-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*promptFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*failFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*greetFace: Sans-24 -xlogin*face: Sans-14 -xlogin*promptFace: Sans-14:bold -xlogin*failFace: Sans-14:bold +xlogin*greetFont: -*-spleen-*-*-*-*-32-*-*-*-*-*-*-* +xlogin*font: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*promptFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*failFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*greetFace: Liberation Sans:pixelsize=32:hintstyle=hintslight +xlogin*face: Liberation Mono:pixelsize=16:hintstyle=hintslight +xlogin*promptFace: Liberation Mono:pixelsize=16:hintstyle=hintslight +xlogin*failFace: Liberation Mono:pixelsize=16:hintstyle=hintslight XHASHelse -xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1 -xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1 -xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1 -xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1 -xlogin*greetFace: Sans-18 -xlogin*face: Sans-12 -xlogin*promptFace: Sans-12:bold -xlogin*failFace: Sans-14:bold +xlogin*greetFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*font: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*promptFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*failFont: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* +xlogin*greetFace: Liberation Sans:pixelsize=16:hintstyle=hintslight +xlogin*face: Libreation Mono:pixelsize=16:hintstyle=hintslight +xlogin*face: Libreation Mono:pixelsize=16:hintstyle=hintslight +xlogin*promptFace: Libreation Mono:pixelsize=16:hintstyle=hintslight +xlogin*failFace: Libreation Mono:pixelsize=16:hintstyle=hintslight XHASHendif -XHASHifdef COLOR -xlogin*borderWidth: 1 -xlogin*frameWidth: 5 +xlogin*borderWidth: 2 +xlogin*frameWidth: 2 xlogin*innerFramesWidth: 2 -xlogin*shdColor: grey30 -xlogin*hiColor: grey90 -xlogin*background: grey -xlogin*inpColor: grey -!xlogin*foreground: darkgreen -xlogin*greetColor: Blue3 -xlogin*failColor: red -*Foreground: black -*Background: #f0 +xlogin*sepWidth: 0 + +XHASHifdef COLOR +xlogin*shdColor: steelblue +xlogin*hiColor: steelblue +xlogin*background: white +xlogin*inpColor: lavender +xlogin*greetColor: black +xlogin*failColor: darkred XHASHelse -xlogin*borderWidth: 3 -xlogin*frameWidth: 0 -xlogin*innerFramesWidth: 1 xlogin*shdColor: black xlogin*hiColor: black +xlogin*background: white +xlogin*inpColor: white +xlogin*greetColor: black +xlogin*failColor: black XHASHendif -#ifdef XPM -XHASHif PLANES >= 8 -XHASHif 1 -! XDM has no support for images with alpha channel, so we precomputed a -! NetBSD logo with fixed background and use it here. If you change this -! file to use another background colour, you need to create a new logo -! xpm file. This can be done with netpbm from pkgsrc: -! -! pngtopnm -mix -background grey NetBSD-flag.png | pnmtoxpm > NetBSD-flag.xpm -! -! (all files in BITMAPDIR) -! -xlogin*logoFileName: BITMAPDIR/**//NetBSD-flag1.xpm -xlogin*useShape: false -XHASHelse -! -! This is the stock method, using a coloured xpm file and a b mask xpm. -! Antialiased borders look ugly this way, but it works with arbitrary -! background colours. -! + +*Foreground: black +*Background: white + xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP xlogin*useShape: true -XHASHendif -XHASHelse -xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP -xlogin*useShape: true -XHASHendif -xlogin*logoPadding: 10 -#endif /* XPM */ +xlogin*logoPadding: 12 XConsole.text.geometry: 480x130 XConsole.verbose: true XConsole*iconic: true -XConsole*font: fixed +XConsole*font: -*-spleen-*-*-*-*-16-*-*-*-*-*-*-* Chooser*geometry: 700x500+300+200
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Thu May 5 15:26:11 UTC 2022 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: xdm: Match the default ctwm theme. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.