Mon Oct 26 16:24:09 2020 UTC ()
xdm(8): fix definitions of truetype fonts in the default resource file

we don't ship with a truetype helvetica.


(nia)
diff -r1.4 -r1.5 src/external/mit/xorg/bin/xdm/config/Xresources.in
cvs diff -r1.4 -r1.5 src/external/mit/xorg/bin/xdm/config/Xresources.in (switch to unified diff)

--- src/external/mit/xorg/bin/xdm/config/Xresources.in 2019/03/29 16:07:01 1.4
+++ src/external/mit/xorg/bin/xdm/config/Xresources.in 2020/10/26 16:24:09 1.5
@@ -1,101 +1,101 @@ @@ -1,101 +1,101 @@
1Xcursor.theme: whiteglass 1Xcursor.theme: whiteglass
2 2
3xlogin*login.translations: #override BS 3xlogin*login.translations: #override BS
4 Ctrl<Key>R: abort-display()NLBS 4 Ctrl<Key>R: abort-display()NLBS
5 <Key>F1: set-session-argument(failsafe) finish-field()NLBS 5 <Key>F1: set-session-argument(failsafe) finish-field()NLBS
6 <Key>Delete: delete-character()NLBS 6 <Key>Delete: delete-character()NLBS
7 <Key>Left: move-backward-character()NLBS 7 <Key>Left: move-backward-character()NLBS
8 <Key>Right: move-forward-character()NLBS 8 <Key>Right: move-forward-character()NLBS
9 <Key>Home: move-to-begining()NLBS 9 <Key>Home: move-to-begining()NLBS
10 <Key>End: move-to-end()NLBS 10 <Key>End: move-to-end()NLBS
11 Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()NLBS 11 Ctrl<Key>KP_Enter: set-session-argument(failsafe) finish-field()NLBS
12 <Key>KP_Enter: set-session-argument() finish-field()NLBS 12 <Key>KP_Enter: set-session-argument() finish-field()NLBS
13 Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS 13 Ctrl<Key>Return: set-session-argument(failsafe) finish-field()NLBS
14 <Key>Return: set-session-argument() finish-field() 14 <Key>Return: set-session-argument() finish-field()
15 15
16xlogin*greeting: Welcome to CLIENTHOST 16xlogin*greeting: Welcome to CLIENTHOST
17xlogin*namePrompt: \040\040\040\040\040\040\040Login: 17xlogin*namePrompt: \040\040\040\040\040\040\040Login:
18xlogin*fail: Login incorrect or forbidden by policy 18xlogin*fail: Login incorrect or forbidden by policy
19 19
20XHASHif WIDTH > 800 20XHASHif WIDTH > 800
21xlogin*greetFont: -adobe-helvetica-bold-o-normal-*-18-*-*-*-*-*-iso8859-1 21xlogin*greetFont: -adobe-helvetica-bold-o-normal-*-18-*-*-*-*-*-iso8859-1
22xlogin*font: -adobe-helvetica-medium-o-normal-*-14-*-*-*-*-*-iso8859-1 22xlogin*font: -adobe-helvetica-medium-o-normal-*-14-*-*-*-*-*-iso8859-1
23xlogin*promptFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 23xlogin*promptFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1
24xlogin*failFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 24xlogin*failFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1
25xlogin*greetFace: Serif-24:bold:italic 25xlogin*greetFace: Sans-24
26xlogin*face: Helvetica-14 26xlogin*face: Sans-14
27xlogin*promptFace: Helvetica-14:bold 27xlogin*promptFace: Sans-14:bold
28xlogin*failFace: Helvetica-14:bold 28xlogin*failFace: Sans-14:bold
29XHASHelse 29XHASHelse
30xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1 30xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
31xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1 31xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
32xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1 32xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
33xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1 33xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
34xlogin*greetFace: Serif-18:bold:italic 34xlogin*greetFace: Sans-18
35xlogin*face: Helvetica-12 35xlogin*face: Sans-12
36xlogin*promptFace: Helvetica-12:bold 36xlogin*promptFace: Sans-12:bold
37xlogin*failFace: Helvetica-14:bold 37xlogin*failFace: Sans-14:bold
38XHASHendif 38XHASHendif
39 39
40XHASHifdef COLOR 40XHASHifdef COLOR
41xlogin*borderWidth: 1 41xlogin*borderWidth: 1
42xlogin*frameWidth: 5 42xlogin*frameWidth: 5
43xlogin*innerFramesWidth: 2 43xlogin*innerFramesWidth: 2
44xlogin*shdColor: grey30 44xlogin*shdColor: grey30
45xlogin*hiColor: grey90 45xlogin*hiColor: grey90
46xlogin*background: grey 46xlogin*background: grey
47xlogin*inpColor: grey 47xlogin*inpColor: grey
48!xlogin*foreground: darkgreen 48!xlogin*foreground: darkgreen
49xlogin*greetColor: Blue3 49xlogin*greetColor: Blue3
50xlogin*failColor: red 50xlogin*failColor: red
51*Foreground: black 51*Foreground: black
52*Background: #fffff0 52*Background: #fffff0
53XHASHelse 53XHASHelse
54xlogin*borderWidth: 3 54xlogin*borderWidth: 3
55xlogin*frameWidth: 0 55xlogin*frameWidth: 0
56xlogin*innerFramesWidth: 1 56xlogin*innerFramesWidth: 1
57xlogin*shdColor: black 57xlogin*shdColor: black
58xlogin*hiColor: black 58xlogin*hiColor: black
59XHASHendif 59XHASHendif
60#ifdef XPM 60#ifdef XPM
61XHASHif PLANES >= 8 61XHASHif PLANES >= 8
62XHASHif 1 62XHASHif 1
63! XDM has no support for images with alpha channel, so we precomputed a 63! XDM has no support for images with alpha channel, so we precomputed a
64! NetBSD logo with fixed background and use it here. If you change this 64! NetBSD logo with fixed background and use it here. If you change this
65! file to use another background colour, you need to create a new logo 65! file to use another background colour, you need to create a new logo
66! xpm file. This can be done with netpbm from pkgsrc: 66! xpm file. This can be done with netpbm from pkgsrc:
67! 67!
68! pngtopnm -mix -background grey NetBSD-flag.png | pnmtoxpm > NetBSD-flag.xpm 68! pngtopnm -mix -background grey NetBSD-flag.png | pnmtoxpm > NetBSD-flag.xpm
69! 69!
70! (all files in BITMAPDIR) 70! (all files in BITMAPDIR)
71! 71!
72xlogin*logoFileName: BITMAPDIR/**//NetBSD-flag1.xpm 72xlogin*logoFileName: BITMAPDIR/**//NetBSD-flag1.xpm
73xlogin*useShape: false 73xlogin*useShape: false
74XHASHelse 74XHASHelse
75! 75!
76! This is the stock method, using a coloured xpm file and a b&w mask xpm. 76! This is the stock method, using a coloured xpm file and a b&w mask xpm.
77! Antialiased borders look ugly this way, but it works with arbitrary 77! Antialiased borders look ugly this way, but it works with arbitrary
78! background colours. 78! background colours.
79! 79!
80xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP 80xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP
81xlogin*useShape: true 81xlogin*useShape: true
82XHASHendif 82XHASHendif
83XHASHelse 83XHASHelse
84xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP 84xlogin*logoFileName: BITMAPDIR/**//XDM_BWPIXMAP
85xlogin*useShape: true 85xlogin*useShape: true
86XHASHendif 86XHASHendif
87xlogin*logoPadding: 10 87xlogin*logoPadding: 10
88#endif /* XPM */ 88#endif /* XPM */
89 89
90XConsole.text.geometry: 480x130 90XConsole.text.geometry: 480x130
91XConsole.verbose: true 91XConsole.verbose: true
92XConsole*iconic: true 92XConsole*iconic: true
93XConsole*font: fixed 93XConsole*font: fixed
94 94
95Chooser*geometry: 700x500+300+200 95Chooser*geometry: 700x500+300+200
96Chooser*allowShellResize: false 96Chooser*allowShellResize: false
97Chooser*viewport.forceBars: true 97Chooser*viewport.forceBars: true
98Chooser*label.font: *-new century schoolbook-bold-i-normal-*-240-* 98Chooser*label.font: *-new century schoolbook-bold-i-normal-*-240-*
99Chooser*label.label: XDMCP Host Menu from CLIENTHOST 99Chooser*label.label: XDMCP Host Menu from CLIENTHOST
100Chooser*list.font: -*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1 100Chooser*list.font: -*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1
101Chooser*Command.font: *-new century schoolbook-bold-r-normal-*-180-* 101Chooser*Command.font: *-new century schoolbook-bold-r-normal-*-180-*