| 1 |
hwoarang 12/02/04 10:47:27 |
| 2 |
|
| 3 |
Added: lxde |
| 4 |
Log: |
| 5 |
Add X11 session file. This should fix 325689. Thanks to Nikolaj Sjujskij <sterkrig@×××××××.com?> |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 lxde-base/lxde-common/files/lxde |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxde-common/files/lxde?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/lxde-base/lxde-common/files/lxde?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lxde |
| 16 |
=================================================================== |
| 17 |
#!/bin/sh |
| 18 |
# LXDE Xsession starter, based on Xsession shipped by x11-apps/xinit-1.0.5-r1 |
| 19 |
|
| 20 |
# redirect errors to a file in user's home directory if we can |
| 21 |
for errfile in "$HOME/.lxde-errors" "${TMPDIR-/tmp}/lxde-$USER" "/tmp/lxde-$USER" |
| 22 |
do |
| 23 |
if ( cp /dev/null "$errfile" 2> /dev/null ) |
| 24 |
then |
| 25 |
chmod 600 "$errfile" |
| 26 |
exec > "$errfile" 2>&1 |
| 27 |
break |
| 28 |
fi |
| 29 |
done |
| 30 |
|
| 31 |
userresources=$HOME/.Xresources |
| 32 |
usermodmap=$HOME/.Xmodmap |
| 33 |
userxkbmap=$HOME/.Xkbmap |
| 34 |
|
| 35 |
sysresources=/etc/X11/Xresources |
| 36 |
sysmodmap=/etc/X11/Xmodmap |
| 37 |
sysxkbmap=/etc/X11/Xkbmap |
| 38 |
|
| 39 |
rh6sysresources=/etc/X11/xinit/Xresources |
| 40 |
rh6sysmodmap=/etc/X11/xinit/Xmodmap |
| 41 |
|
| 42 |
|
| 43 |
# merge in defaults |
| 44 |
if [ -f "$rh6sysresources" ]; then |
| 45 |
xrdb -merge "$rh6sysresources" |
| 46 |
fi |
| 47 |
|
| 48 |
if [ -f "$sysresources" ]; then |
| 49 |
xrdb -merge "$sysresources" |
| 50 |
fi |
| 51 |
|
| 52 |
if [ -f "$userresources" ]; then |
| 53 |
xrdb -merge "$userresources" |
| 54 |
fi |
| 55 |
|
| 56 |
# merge in keymaps |
| 57 |
if [ -f "$sysxkbmap" ]; then |
| 58 |
setxkbmap `cat "$sysxkbmap"` |
| 59 |
XKB_IN_USE=yes |
| 60 |
fi |
| 61 |
|
| 62 |
if [ -f "$userxkbmap" ]; then |
| 63 |
setxkbmap `cat "$userxkbmap"` |
| 64 |
XKB_IN_USE=yes |
| 65 |
fi |
| 66 |
|
| 67 |
# |
| 68 |
# Eeek, this seems like too much magic here |
| 69 |
# |
| 70 |
if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then |
| 71 |
if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then |
| 72 |
xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config /etc/X11/xorg.conf` |
| 73 |
if [ -n "$xkbsymbols" ]; then |
| 74 |
setxkbmap -symbols "$xkbsymbols" |
| 75 |
XKB_IN_USE=yes |
| 76 |
fi |
| 77 |
fi |
| 78 |
fi |
| 79 |
|
| 80 |
# xkb and xmodmap don't play nice together |
| 81 |
if [ -z "$XKB_IN_USE" ]; then |
| 82 |
if [ -f "$rh6sysmodmap" ]; then |
| 83 |
xmodmap "$rh6sysmodmap" |
| 84 |
fi |
| 85 |
|
| 86 |
if [ -f "$sysmodmap" ]; then |
| 87 |
xmodmap "$sysmodmap" |
| 88 |
fi |
| 89 |
|
| 90 |
if [ -f "$usermodmap" ]; then |
| 91 |
xmodmap "$usermodmap" |
| 92 |
fi |
| 93 |
fi |
| 94 |
|
| 95 |
unset XKB_IN_USE |
| 96 |
|
| 97 |
# run all system xinitrc shell scripts. |
| 98 |
if [ -d /etc/X11/xinit/xinitrc.d ]; then |
| 99 |
for i in /etc/X11/xinit/xinitrc.d/* ; do |
| 100 |
if [ -x "$i" ]; then |
| 101 |
. "$i" |
| 102 |
fi |
| 103 |
done |
| 104 |
fi |
| 105 |
|
| 106 |
exec /usr/bin/startlxde |
Archives