View | Details | Raw Unified | Return to bug 172100 | Differences between
and this patch

Collapse All | Expand All

(-)config/Xreset (-1 / +3 lines)
Lines 1-4 \$ Link Here
1 
\$
2 
\$
1 
#!/bin/sh\$
 3 
#!/bin/sh\$
2 
#·Deregister·a·login.·(Derived·from·TakeConsole·as·follows:)\$
 4 
#·Deregister·a·login.·(Derived·from·TakeConsole·as·follows:)\$
3 
#\$
 5 
#\$
4 
/usr/local/bin/sessreg·-d·-w·/var/log/wtmp·-u·/var/run/utmp·\^I-x·/usr/local/lib/X11/xdm/Xservers·-l·$DISPLAY·-h·""·$USER\$
 6 
/usr/local/bin/sessreg·-d·-w·/var/log/wtmp·-u·/var/run/utmp·-x·/usr/local/lib/X11/xdm/Xservers·-l·$DISPLAY·-h·""·$USER\$
(-)config/Xresources (-33 / +35 lines)
Lines 1-19 \$ Link Here
1 
\$
2 
\$
1 
Xcursor.theme:·whiteglass\$
 3 
Xcursor.theme:·whiteglass\$
2 
\$
 4 
\$
3 
\$
 5 
\$
4 
\$
 6 
\$
5 
xlogin*login.translations:·#override·\\\$
 7 
xlogin*login.translations:·#override·\\\$
6 
\^ICtrl<Key>R:·abort-display()\\n\\\$
 8 
·Ctrl<Key>R:·abort-display()\\n\\\$
7 
\^I<Key>F1:·set-session-argument(failsafe)·finish-field()\\n\\\$
 9 
·<Key>F1:·set-session-argument(failsafe)·finish-field()\\n\\\$
8 
\^I<Key>Delete:·delete-character()\\n\\\$
 10 
·<Key>Delete:·delete-character()\\n\\\$
9 
\^I<Key>Left:·move-backward-character()\\n\\\$
 11 
·<Key>Left:·move-backward-character()\\n\\\$
10 
\^I<Key>Right:·move-forward-character()\\n\\\$
 12 
·<Key>Right:·move-forward-character()\\n\\\$
11 
\^I<Key>Home:·move-to-begining()\\n\\\$
 13 
·<Key>Home:·move-to-begining()\\n\\\$
12 
\^I<Key>End:·move-to-end()\\n\\\$
 14 
·<Key>End:·move-to-end()\\n\\\$
13 
\^ICtrl<Key>KP_Enter:·set-session-argument(failsafe)·finish-field()\\n\\\$
 15 
·Ctrl<Key>KP_Enter:·set-session-argument(failsafe)·finish-field()\\n\\\$
14 
\^I<Key>KP_Enter:·set-session-argument()·finish-field()\\n\\\$
 16 
·<Key>KP_Enter:·set-session-argument()·finish-field()\\n\\\$
15 
\^ICtrl<Key>Return:·set-session-argument(failsafe)·finish-field()\\n\\\$
 17 
·Ctrl<Key>Return:·set-session-argument(failsafe)·finish-field()\\n\\\$
16 
\^I<Key>Return:·set-session-argument()·finish-field()\$
 18 
·<Key>Return:·set-session-argument()·finish-field()\$
17 
\$
 19 
\$
18 
xlogin*greeting:·Welcome·to·CLIENTHOST\$
 20 
xlogin*greeting:·Welcome·to·CLIENTHOST\$
19 
xlogin*namePrompt:·\\040\\040\\040\\040\\040\\040\\040Login:\$
 21 
xlogin*namePrompt:·\\040\\040\\040\\040\\040\\040\\040Login:\$
Lines 24-42 xlogin*greetFont: -adobe-helvetica-bold-\$ Link Here
24 
xlogin*font:·-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1\$
 26 
xlogin*font:·-adobe-helvetica-medium-r-normal--18-180-75-75-p-98-iso8859-1\$
25 
xlogin*promptFont:·-adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1\$
 27 
xlogin*promptFont:·-adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1\$
26 
xlogin*failFont:·-adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1\$
 28 
xlogin*failFont:·-adobe-helvetica-bold-r-normal--18-180-75-75-p-103-iso8859-1\$
27 
xlogin*greetFace:\^ISerif-24:bold:italic\$
 29 
xlogin*greetFace:·Serif-24:bold:italic\$
28 
xlogin*face:·\^I\^IHelvetica-18\$
 30 
xlogin*face:·Helvetica-18\$
29 
xlogin*promptFace:·\^IHelvetica-18:bold\$
 31 
xlogin*promptFace:·Helvetica-18:bold\$
30 
xlogin*failFace:·\^IHelvetica-18:bold\$
 32 
xlogin*failFace:·Helvetica-18:bold\$
31 
#else\$
 33 
#else\$
32 
xlogin*greetFont:·-adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1\$
 34 
xlogin*greetFont:·-adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1\$
33 
xlogin*font:·-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1\$
 35 
xlogin*font:·-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1\$
34 
xlogin*promptFont:·-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1\$
 36 
xlogin*promptFont:·-adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1\$
35 
xlogin*failFont:·-adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1\$
 37 
xlogin*failFont:·-adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1\$
36 
xlogin*greetFace:\^ISerif-18:bold:italic\$
 38 
xlogin*greetFace:·Serif-18:bold:italic\$
37 
xlogin*face:\^I\^IHelvetica-12\$
 39 
xlogin*face:·Helvetica-12\$
38 
xlogin*promptFace:\^IHelvetica-12:bold\$
 40 
xlogin*promptFace:·Helvetica-12:bold\$
39 
xlogin*failFace:\^IHelvetica-14:bold\$
 41 
xlogin*failFace:·Helvetica-14:bold\$
40 
#endif\$
 42 
#endif\$
41 
\$
 43 
\$
42 
#ifdef·COLOR\$
 44 
#ifdef·COLOR\$
Lines 60-82 xlogin*hiColor: black\$ Link Here
60 
#endif\$
 62 
#endif\$
61 
\$
 63 
\$
62 
#if·PLANES·>=·8\$
 64 
#if·PLANES·>=·8\$
63 
xlogin*logoFileName:·/usr/local/lib/X11/xdm/pixmaps/xorg.xpm\$
 65 
xlogin*logoFileName:·/usr/local/lib/X11/xdm/pixmaps·/xorg.xpm\$
64 
#else\$
 66 
#else\$
65 
xlogin*logoFileName:·/usr/local/lib/X11/xdm/pixmaps/xorg-bw.xpm\$
 67 
xlogin*logoFileName:·/usr/local/lib/X11/xdm/pixmaps·/xorg-bw.xpm\$
66 
#endif\$
 68 
#endif\$
67 
xlogin*useShape:·true\$
 69 
xlogin*useShape:·true\$
68 
xlogin*logoPadding:·10\$
 70 
xlogin*logoPadding:·10\$
69 
\$
 71 
\$
70 
\$
 72 
\$
71 
XConsole.text.geometry:\^I480x130\$
 73 
XConsole.text.geometry:·480x130\$
72 
XConsole.verbose:\^Itrue\$
 74 
XConsole.verbose:·true\$
73 
XConsole*iconic:\^Itrue\$
 75 
XConsole*iconic:·true\$
74 
XConsole*font:\^I\^Ifixed\$
 76 
XConsole*font:·fixed\$
75 
\$
 77 
\$
76 
Chooser*geometry:\^I\^I700x500+300+200\$
 78 
Chooser*geometry:·700x500+300+200\$
77 
Chooser*allowShellResize:\^Ifalse\$
 79 
Chooser*allowShellResize:·false\$
78 
Chooser*viewport.forceBars:\^Itrue\$
 80 
Chooser*viewport.forceBars:·true\$
79 
Chooser*label.font:\^I\^I*-new·century·schoolbook-bold-i-normal-*-240-*\$
 81 
Chooser*label.font:·*-new·century·schoolbook-bold-i-normal-*-240-*\$
80 
Chooser*label.label:\^I\^IXDMCP·Host·Menu·from·CLIENTHOST\$
 82 
Chooser*label.label:·XDMCP·Host·Menu·from·CLIENTHOST\$
81 
Chooser*list.font:\^I\^I-*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1\$
 83 
Chooser*list.font:·-*-*-medium-r-normal-*-*-230-*-*-c-*-iso8859-1\$
82 
Chooser*Command.font:\^I\^I*-new·century·schoolbook-bold-r-normal-*-180-*\$
 84 
Chooser*Command.font:·*-new·century·schoolbook-bold-r-normal-*-180-*\$
(-)config/Xservers (-3 / +5 lines)
Lines 1-12 \$ Link Here
1 
\$
2 
\$
1 
#\$
 3 
#\$
2 
#·Xservers·file,·workstation·prototype\$
 4 
#·Xservers·file,·workstation·prototype\$
3 
#\$
 5 
#\$
4 
#·This·file·should·contain·an·entry·to·start·the·server·on·the\$
 6 
#·This·file·should·contain·an·entry·to·start·the·server·on·the\$
5 
#·local·display;·if·you·have·more·than·one·display·(not·screen),\$
 7 
#·local·display;·if·you·have·more·than·one·display·(not·screen),\$
6 
#·you·can·add·entries·to·the·list·(one·per·line).··If·you·also\$
 8 
#·you·can·add·entries·to·the·list·(one·per·line).·If·you·also\$
7 
#·have·some·X·terminals·connected·which·do·not·support·XDMCP,\$
 9 
#·have·some·X·terminals·connected·which·do·not·support·XDMCP,\$
8 
#·you·can·add·them·here·as·well.··Each·X·terminal·line·should\$
 10 
#·you·can·add·them·here·as·well.·Each·X·terminal·line·should\$
9 
#·look·like:\$
 11 
#·look·like:\$
10 
#\^IXTerminalName:0·foreign\$
 12 
#·XTerminalName:0·foreign\$
11 
#\$
 13 
#\$
12 
:0·local·/usr/local/bin/X·:0·\$
 14 
:0·local·/usr/local/bin/X·:0·\$
(-)config/Xservers.ws (-3 / +5 lines)
Lines 1-12 \$ Link Here
1 
\$
2 
\$
1 
#\$
 3 
#\$
2 
#·Xservers·file,·workstation·prototype\$
 4 
#·Xservers·file,·workstation·prototype\$
3 
#\$
 5 
#\$
4 
#·This·file·should·contain·an·entry·to·start·the·server·on·the\$
 6 
#·This·file·should·contain·an·entry·to·start·the·server·on·the\$
5 
#·local·display;·if·you·have·more·than·one·display·(not·screen),\$
 7 
#·local·display;·if·you·have·more·than·one·display·(not·screen),\$
6 
#·you·can·add·entries·to·the·list·(one·per·line).··If·you·also\$
 8 
#·you·can·add·entries·to·the·list·(one·per·line).·If·you·also\$
7 
#·have·some·X·terminals·connected·which·do·not·support·XDMCP,\$
 9 
#·have·some·X·terminals·connected·which·do·not·support·XDMCP,\$
8 
#·you·can·add·them·here·as·well.··Each·X·terminal·line·should\$
 10 
#·you·can·add·them·here·as·well.·Each·X·terminal·line·should\$
9 
#·look·like:\$
 11 
#·look·like:\$
10 
#\^IXTerminalName:0·foreign\$
 12 
#·XTerminalName:0·foreign\$
11 
#\$
 13 
#\$
12 
:0·local·/usr/local/bin/X·:0·\$
 14 
:0·local·/usr/local/bin/X·:0·\$
(-)config/Xsession (-25 / +27 lines)
Lines 1-3 \$ Link Here
1 
\$
2 
\$
1 
#!/bin/sh\$
 3 
#!/bin/sh\$
2 
#\$
 4 
#\$
3 
\$
 5 
\$
Lines 6-33 \$ Link Here
6 
errfile="$HOME/.xsession-errors"\$
 8 
errfile="$HOME/.xsession-errors"\$
7 
if·(·umask·077·&&·cp·/dev/null·"$errfile"·2>·/dev/null·)\$
 9 
if·(·umask·077·&&·cp·/dev/null·"$errfile"·2>·/dev/null·)\$
8 
then\$
 10 
then\$
9 
\^Iexec·>·"$errfile"·2>&1\$
 11 
·exec·>·"$errfile"·2>&1\$
10 
else\$
 12 
else\$
11 
\$
 13 
\$
12 
\^Imktemp=/usr/bin/mktemp\$
 14 
·mktemp=/usr/bin/mktemp\$
13 
\^Ifor·errfile·in·"${TMPDIR-/tmp}/xses-$USER"·"/tmp/xses-$USER"\$
 15 
·for·errfile·in·"${TMPDIR-/tmp}/xses-$USER"·"/tmp/xses-$USER"\$
14 
\^Ido\$
 16 
·do\$
15 
\^I\^Iif·ef="$(·umask·077·&&·$mktemp·"$errfile.XXXXXX"·2>·/dev/null)"\$
 17 
··if·ef="$(·umask·077·&&·$mktemp·"$errfile.XXXXXX"·2>·/dev/null)"\$
16 
\^I\^Ithen\$
 18 
··then\$
17 
\^I\^I\^Iexec·>·"$ef"·2>&1\$
 19 
···exec·>·"$ef"·2>&1\$
18 
\^I\^I\^Imv·"$ef"·"$errfile"·2>·/dev/null\$
 20 
···mv·"$ef"·"$errfile"·2>·/dev/null\$
19 
\^I\^I\^Ibreak\$
 21 
···break\$
20 
\^I\^Ifi\$
 22 
··fi\$
21 
\^Idone\$
 23 
·done\$
22 
fi\$
 24 
fi\$
23 
\$
 25 
\$
24 
case·$#·in\$
 26 
case·$#·in\$
25 
1)\$
 27 
1)\$
26 
\^Icase·$1·in\$
 28 
·case·$1·in\$
27 
\^Ifailsafe)\$
 29 
·failsafe)\$
28 
\^I\^Iexec·/usr/local/bin/xterm·-geometry·80x24-0-0\$
 30 
··exec·/usr/local/bin/xterm·-geometry·80x24-0-0\$
29 
\^I\^I;;\$
 31 
··;;\$
30 
\^Iesac\$
 32 
·esac\$
31 
esac\$
 33 
esac\$
32 
\$
 34 
\$
33 
#·The·startup·script·is·not·intended·to·have·arguments.\$
 35 
#·The·startup·script·is·not·intended·to·have·arguments.\$
Lines 36-49 startup=$HOME/.xsession\$ Link Here
36 
resources=$HOME/.Xresources\$
 38 
resources=$HOME/.Xresources\$
37 
\$
 39 
\$
38 
if·[·-s·"$startup"·];·then\$
 40 
if·[·-s·"$startup"·];·then\$
39 
\^Iif·[·-x·"$startup"·];·then\$
 41 
·if·[·-x·"$startup"·];·then\$
40 
\^I\^Iexec·"$startup"\$
 42 
··exec·"$startup"\$
41 
\^Ielse\$
 43 
·else\$
42 
\^I\^Iexec·/bin/sh·"$startup"\$
 44 
··exec·/bin/sh·"$startup"\$
43 
\^Ifi\$
 45 
·fi\$
44 
else\$
 46 
else\$
45 
\^Iif·[·-r·"$resources"·];·then\$
 47 
·if·[·-r·"$resources"·];·then\$
46 
\^I\^I/usr/local/bin/xrdb·-load·"$resources"\$
 48 
··/usr/local/bin/xrdb·-load·"$resources"\$
47 
\^Ifi\$
 49 
·fi\$
48 
\^Iexec·/usr/local/bin/xsm\$
 50 
·exec·/usr/local/bin/xsm\$
49 
fi\$
 51 
fi\$
(-)config/Xstartup (-1 / +3 lines)
Lines 1-4 \$ Link Here
1 
\$
2 
\$
1 
#!/bin/sh\$
 3 
#!/bin/sh\$
2 
#·Register·a·login·(derived·from·GiveConsole·as·follows:)\$
 4 
#·Register·a·login·(derived·from·GiveConsole·as·follows:)\$
3 
#\$
 5 
#\$
4 
exec·/usr/local/bin/sessreg··-a·-w·/var/log/wtmp·-u·/var/run/utmp·\^I-x·/usr/local/lib/X11/xdm/Xservers·-l·$DISPLAY·-h·""·$USER\$
 6 
exec·/usr/local/bin/sessreg·-a·-w·/var/log/wtmp·-u·/var/run/utmp·-x·/usr/local/lib/X11/xdm/Xservers·-l·$DISPLAY·-h·""·$USER\$
(-)config/xdm-config (-19 / +21 lines)
Lines 1-3 \$ Link Here
1 
\$
2 
\$
1 
!\$
 3 
!\$
2 
!\$
 4 
!\$
3 
!\$
 5 
!\$
Lines 9-39 \$ Link Here
9 
\$
 11 
\$
10 
\$
 12 
\$
11 
\$
 13 
\$
12 
DisplayManager.authDir:\^I/var/lib/xdm\$
 14 
DisplayManager.authDir:·/var/lib/xdm\$
13 
DisplayManager.errorLogFile:\^I/var/log/xdm.log\$
 15 
DisplayManager.errorLogFile:·/var/log/xdm.log\$
14 
DisplayManager.pidFile:\^I\^I/var/run/xdm.pid\$
 16 
DisplayManager.pidFile:·/var/run/xdm.pid\$
15 
DisplayManager.keyFile:\^I\^I/usr/local/lib/X11/xdm/xdm-keys\$
 17 
DisplayManager.keyFile:·/usr/local/lib/X11/xdm/xdm-keys\$
16 
DisplayManager.servers:\^I\^I/usr/local/lib/X11/xdm/Xservers\$
 18 
DisplayManager.servers:·/usr/local/lib/X11/xdm/Xservers\$
17 
DisplayManager.accessFile:\^I/usr/local/lib/X11/xdm/Xaccess\$
 19 
DisplayManager.accessFile:·/usr/local/lib/X11/xdm/Xaccess\$
18 
DisplayManager*resources:\^I/usr/local/lib/X11/xdm/Xresources\$
 20 
DisplayManager*resources:·/usr/local/lib/X11/xdm/Xresources\$
19 
DisplayManager.willing:\^I\^Isu·-m·nobody·-s·/bin/sh·-c·/usr/local/lib/X11/xdm/Xwilling\$
 21 
DisplayManager.willing:·su·-m·nobody·-s·/bin/sh·-c·/usr/local/lib/X11/xdm/Xwilling\$
20 
!·All·displays·should·use·authorization,·but·we·cannot·be·sure\$
 22 
!·All·displays·should·use·authorization,·but·we·cannot·be·sure\$
21 
!·X·terminals·may·not·be·configured·that·way,·so·they·will·require\$
 23 
!·X·terminals·may·not·be·configured·that·way,·so·they·will·require\$
22 
!·individual·resource·settings.\$
 24 
!·individual·resource·settings.\$
23 
DisplayManager*authorize:\^Itrue\$
 25 
DisplayManager*authorize:·true\$
24 
!\$
 26 
!\$
25 
DisplayManager*chooser:\^I\^I/usr/local/lib/X11/xdm/chooser\$
 27 
DisplayManager*chooser:·/usr/local/lib/X11/xdm/chooser\$
26 
DisplayManager*startup:\^I\^I/usr/local/lib/X11/xdm/Xstartup\$
 28 
DisplayManager*startup:·/usr/local/lib/X11/xdm/Xstartup\$
27 
DisplayManager*session:\^I\^I/usr/local/lib/X11/xdm/Xsession\$
 29 
DisplayManager*session:·/usr/local/lib/X11/xdm/Xsession\$
28 
DisplayManager*reset:\^I\^I/usr/local/lib/X11/xdm/Xreset\$
 30 
DisplayManager*reset:·/usr/local/lib/X11/xdm/Xreset\$
29 
DisplayManager*authComplain:\^Itrue\$
 31 
DisplayManager*authComplain:·true\$
30 
!·The·following·three·resources·set·up·display·:0·as·the·console.\$
 32 
!·The·following·three·resources·set·up·display·:0·as·the·console.\$
31 
DisplayManager._0.setup:\^I/usr/local/lib/X11/xdm/Xsetup_0\$
 33 
DisplayManager._0.setup:·/usr/local/lib/X11/xdm/Xsetup_0\$
32 
DisplayManager._0.startup:\^I/usr/local/lib/X11/xdm/GiveConsole\$
 34 
DisplayManager._0.startup:·/usr/local/lib/X11/xdm/GiveConsole\$
33 
DisplayManager._0.reset:\^I/usr/local/lib/X11/xdm/TakeConsole\$
 35 
DisplayManager._0.reset:·/usr/local/lib/X11/xdm/TakeConsole\$
34 
\$
 36 
\$
35 
DisplayManager*loginmoveInterval:\^I10\$
 37 
DisplayManager*loginmoveInterval:·10\$
36 
\$
 38 
\$
37 
!·SECURITY:·do·not·listen·for·XDMCP·or·Chooser·requests\$
 39 
!·SECURITY:·do·not·listen·for·XDMCP·or·Chooser·requests\$
38 
!·Comment·out·this·line·if·you·want·to·manage·X·terminals·with·xdm\$
 40 
!·Comment·out·this·line·if·you·want·to·manage·X·terminals·with·xdm\$
39 
DisplayManager.requestPort:\^I0\$
 41 
DisplayManager.requestPort:·0\$

Return to bug 172100