diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2002-06-03 23:37:45 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2002-06-03 23:37:45 +0000 |
| commit | 642dfb65fd2285e616b2d7545297775025b7cffd (patch) | |
| tree | bb0772839a7ed128956903724775f7fe6aec7ba7 /x11-base | |
| parent | new version of libwnck added. (diff) | |
| download | historical-642dfb65fd2285e616b2d7545297775025b7cffd.tar.gz historical-642dfb65fd2285e616b2d7545297775025b7cffd.tar.bz2 historical-642dfb65fd2285e616b2d7545297775025b7cffd.zip | |
comments
Diffstat (limited to 'x11-base')
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r11/Xsession | 41 | ||||
| -rw-r--r-- | x11-base/xfree/files/4.2.0-r11/xinitrc | 4 |
2 files changed, 26 insertions, 19 deletions
diff --git a/x11-base/xfree/files/4.2.0-r11/Xsession b/x11-base/xfree/files/4.2.0-r11/Xsession index 1cc49d2f8914..961becdb1963 100644 --- a/x11-base/xfree/files/4.2.0-r11/Xsession +++ b/x11-base/xfree/files/4.2.0-r11/Xsession @@ -23,34 +23,39 @@ if [ -n "$1" ]; then export XSESSION="$1" fi -startup=$HOME/.xsession - -userdefaults=$HOME/.Xdefaults -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap - -#Xdefaults -if [ -f "$userdefaults" ]; then - xrdb -merge "$userdefaults" -fi +# This next bit should be in the users ~/.xsession, +# but we have it here as reference +# +#userdefaults=$HOME/.Xdefaults +#userresources=$HOME/.Xresources +#usermodmap=$HOME/.Xmodmap +# +##Xdefaults +#if [ -f "$userdefaults" ]; then +# xrdb -merge "$userdefaults" +#fi #Xresorces -if [ -f "$userresources" ]; then - xrdb -merge "$userresources" -fi -#Xmodmap -if [ -f "$usermodmap" ]; then - xmodmap "$usermodmap" -fi +#if [ -f "$userresources" ]; then +# xrdb -merge "$userresources" +#fi +##Xmodmap +#if [ -f "$usermodmap" ]; then +# xmodmap "$usermodmap" +#fi + +startup=$HOME/.xsession -#xsession +# First run ~/.xsession if it exists if [ -s "$startup" ]; then if [ -x "$startup" ]; then exec "$startup" else exec /bin/sh "$startup" fi +# If not, try the system default elif [ -n "`/etc/X11/chooser.sh`" ]; then exec "`/etc/X11/chooser.sh`" +# Lastly, xsm as failsafe else exec xsm fi diff --git a/x11-base/xfree/files/4.2.0-r11/xinitrc b/x11-base/xfree/files/4.2.0-r11/xinitrc index 04821ff6466d..9a669469a542 100644 --- a/x11-base/xfree/files/4.2.0-r11/xinitrc +++ b/x11-base/xfree/files/4.2.0-r11/xinitrc @@ -24,12 +24,14 @@ if [ -f $usermodmap ]; then xmodmap $usermodmap fi -# handle xinit +# First try ~/.xinitrc if [ -f "$HOME/.xinitrc" ]; then XINITRC="$HOME/.xinitrc" exec /bin/sh "$HOME/.xinitrc" +# If not present, try the system default elif [ -n "`/etc/X11/chooser.sh`" ]; then exec "`/etc/X11/chooser.sh`" +# Failsafe else # start some nice programs twm & |