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 (expand / 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
@@ -12,39 +12,39 @@ xlogin*login.translations: #override BS @@ -12,39 +12,39 @@ xlogin*login.translations: #override BS
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