diff options
| author | Kean Johnson <kean@armory.com> | 2005-11-08 06:33:32 +0000 |
|---|---|---|
| committer | Kean Johnson <kean@armory.com> | 2005-11-08 06:33:32 +0000 |
| commit | 3834f880ba013be524cd5b4ce4ff75734742ad12 (patch) | |
| tree | 4bcccc7370254f205d8eb2fec4c64353a9640ab2 /config/Xsession.cpp | |
| parent | d384b20b3d63f1b28d428f02746d5ec0c1e81a39 (diff) | |
See ChangeLog entry 2005-11-07 for details.XORG-6_8_99_903XORG-6_8_99_902
Diffstat (limited to 'config/Xsession.cpp')
| -rw-r--r-- | config/Xsession.cpp | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/config/Xsession.cpp b/config/Xsession.cpp new file mode 100644 index 0000000..6d4fabd --- /dev/null +++ b/config/Xsession.cpp @@ -0,0 +1,60 @@ +XCOMM!SHELL_CMD +XCOMM +XCOMM $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $ +XCOMM $XFree86: xc/programs/xdm/config/Xsession,v 1.2 1998/01/11 03:48:32 dawes Exp $ + +XCOMM redirect errors to a file in user's home directory if we can +for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER" +do + if ( cp /dev/null "$errfile" 2> /dev/null ) + then + chmod 600 "$errfile" + exec > "$errfile" 2>&1 + break + fi +done + +case $# in +1) + case $1 in + failsafe) + exec BINDIR/xterm -geometry 80x24-0-0 + ;; + esac +esac + +XCOMM The startup script is not intended to have arguments. + +startup=$HOME/.xsession +resources=$HOME/.Xresources + +if [ -s "$startup" ]; then + if [ -x "$startup" ]; then + exec "$startup" + else + exec /bin/sh "$startup" + fi +else + if [ -r "$resources" ]; then + BINDIR/xrdb -load "$resources" + fi +#if defined(__SCO__) || defined(__UNIXWARE__) + [ -r /etc/default/xdesktops ] && { + . /etc/default/xdesktops + } + + [ -r /etc/default/xdm ] && { + . /etc/default/xdm + } + + XCOMM Allow the user to over-ride the system default desktop + [ -r $HOME/.xdmdesktop ] && { + . $HOME/.xdmdesktop + } + + [ -n "$XDESKTOP" ] && { + exec `eval $XDESKTOP` + } +#endif + exec BINDIR/xsm +fi |