diff options
| author | Kean Johnson <kean@armory.com> | 2005-11-08 06:33:33 +0000 |
|---|---|---|
| committer | Kean Johnson <kean@armory.com> | 2005-11-08 06:33:33 +0000 |
| commit | af47a9e0dd891dcaa52b12f4eda85381e0467916 (patch) | |
| tree | 010644422d253e79e293881f666f5185254f8c96 /xinitrc.cpp | |
| parent | 6beb2e4769b8b3708f30ee7adf8037a4e1f39f3d (diff) | |
See ChangeLog entry 2005-11-07 for details.XORG-6_8_99_902
Diffstat (limited to 'xinitrc.cpp')
| -rw-r--r-- | xinitrc.cpp | 62 |
1 files changed, 52 insertions, 10 deletions
diff --git a/xinitrc.cpp b/xinitrc.cpp index 641eede..a145d7e 100644 --- a/xinitrc.cpp +++ b/xinitrc.cpp @@ -1,4 +1,4 @@ -XCOMM!/bin/sh +XCOMM!SHELL_CMD XCOMM $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ userresources=$HOME/.Xresources @@ -9,25 +9,67 @@ sysmodmap=XINITDIR/.Xmodmap XCOMM merge in defaults and keymaps if [ -f $sysresources ]; then - xrdb -merge $sysresources + BINDIR/xrdb -merge $sysresources fi if [ -f $sysmodmap ]; then - xmodmap $sysmodmap + BINDIR/xmodmap $sysmodmap fi if [ -f $userresources ]; then - xrdb -merge $userresources + BINDIR/xrdb -merge $userresources fi if [ -f $usermodmap ]; then - xmodmap $usermodmap + BINDIR/xmodmap $usermodmap fi XCOMM start some nice programs -twm & -xclock -geometry 50x50-1+1 & -xterm -geometry 80x50+494+51 & -xterm -geometry 80x20+494-0 & -exec xterm -geometry 80x66+0+0 -name login +#if defined(__SCO__) || defined(__UNIXWARE__) +if [ -r /etc/default/xdesktops ]; then + . /etc/default/xdesktops +fi + +if [ -r $HOME/.x11rc ]; then + . $HOME/.x11rc +else + if [ -r /etc/default/X11 ]; then + . /etc/default/X11 + fi +fi + +#if defined(__SCO__) +if [ -n "$XSESSION" ]; then + case "$XSESSION" in + [Yy][Ee][Ss]) + [ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession + ;; + esac +fi + +if [ -n "$XDESKTOP" ]; then + exec `eval echo $"$XDESKTOP"` +else + if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then + /usr/bin/X11/scoterm 2> /dev/null & + exec /usr/bin/X11/pmwm 2> /dev/null + fi +fi +#elif defined(__UNIXWARE__) +if [ -n "$XDESKTOP" ]; then + exec `eval echo $"$XDESKTOP"` +else + if [ -x /usr/X/bin/pmwm ]; then + exec /usr/X/bin/pmwm 2> /dev/null + fi +fi +#endif + +XCOMM This is the fallback case if nothing else is executed above +#endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */ +BINDIR/twm & +BINDIR/xclock -geometry 50x50-1+1 & +BINDIR/xterm -geometry 80x50+494+51 & +BINDIR/xterm -geometry 80x20+494-0 & +exec BINDIR/xterm -geometry 80x66+0+0 -name login |