|
Lines 25-34
Link Here
|
| 25 |
|
25 |
|
| 26 |
xinitdir=/usr/X11R6/lib/X11/xinit |
26 |
xinitdir=/usr/X11R6/lib/X11/xinit |
| 27 |
startup=$HOME/.xsession |
27 |
startup=$HOME/.xsession |
| 28 |
userresources=$HOME/.Xresources |
28 |
userresources=$HOME/.Xdefaults |
| 29 |
usermodmap=$HOME/.Xmodmap |
29 |
usermodmap=$HOME/.Xmodmap |
| 30 |
sysresources=$xinitdir/.Xresources |
30 |
sysresources=/etc/X11/Xresources |
| 31 |
sysmodmap=$xinitdir/.Xmodmap |
31 |
sysmodmap=/etc/X11/Xmodmap |
|
|
32 |
|
| 33 |
# merge in defaults and keymaps |
| 34 |
|
| 35 |
if [ -f $sysresources ]; then |
| 36 |
xrdb -merge $sysresources |
| 37 |
fi |
| 38 |
|
| 39 |
if [ -f $sysmodmap ]; then |
| 40 |
xmodmap $sysmodmap |
| 41 |
fi |
| 42 |
|
| 43 |
if [ -f $userresources ]; then |
| 44 |
xrdb -merge $userresources |
| 45 |
fi |
| 46 |
|
| 47 |
if [ -f $usermodmap ]; then |
| 48 |
xmodmap $usermodmap |
| 49 |
fi |
| 50 |
|
| 32 |
|
51 |
|
| 33 |
# First run the system default. Because KDE uses this |
52 |
# First run the system default. Because KDE uses this |
| 34 |
# to switch sessions, we MUST first check the system |
53 |
# to switch sessions, we MUST first check the system |
|
Lines 39-63
Link Here
|
| 39 |
exec "`/etc/X11/chooser.sh`" |
58 |
exec "`/etc/X11/chooser.sh`" |
| 40 |
# If not defined, try the user's ~/.xsession |
59 |
# If not defined, try the user's ~/.xsession |
| 41 |
elif [ -s "$startup" ]; then |
60 |
elif [ -s "$startup" ]; then |
| 42 |
|
|
|
| 43 |
# merge in defaults and keymaps |
| 44 |
|
| 45 |
if [ -f $sysresources ]; then |
| 46 |
xrdb -merge $sysresources |
| 47 |
fi |
| 48 |
|
| 49 |
if [ -f $sysmodmap ]; then |
| 50 |
xmodmap $sysmodmap |
| 51 |
fi |
| 52 |
|
| 53 |
if [ -f $userresources ]; then |
| 54 |
xrdb -merge $userresources |
| 55 |
fi |
| 56 |
|
| 57 |
if [ -f $usermodmap ]; then |
| 58 |
xmodmap $usermodmap |
| 59 |
fi |
| 60 |
|
| 61 |
if [ -x "$startup" ]; then |
61 |
if [ -x "$startup" ]; then |
| 62 |
exec "$startup" |
62 |
exec "$startup" |
| 63 |
else |
63 |
else |
