diff options
Diffstat (limited to 'desktop/fvwm95/xinitrc.fvwm95')
| -rw-r--r-- | desktop/fvwm95/xinitrc.fvwm95 | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/desktop/fvwm95/xinitrc.fvwm95 b/desktop/fvwm95/xinitrc.fvwm95 index b08bba4339854..17a7670ee6b81 100644 --- a/desktop/fvwm95/xinitrc.fvwm95 +++ b/desktop/fvwm95/xinitrc.fvwm95 @@ -1,29 +1,38 @@ #!/bin/sh -# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $ + +# Slackware FVWM95 xinitrc script userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap sysresources=/etc/X11/xinit/.Xresources sysmodmap=/etc/X11/xinit/.Xmodmap +# Uncomment this if you would like fvwm95 to launch in a dbus session. +#dbus_cmd="dbus-launch --exit-with-session" + # merge in defaults and keymaps if [ -f $sysresources ]; then - /usr/bin/xrdb -merge $sysresources + xrdb -merge $sysresources fi if [ -f $sysmodmap ]; then - /usr/bin/xmodmap $sysmodmap + xmodmap $sysmodmap fi if [ -f $userresources ]; then - /usr/bin/xrdb -merge $userresources + xrdb -merge $userresources fi if [ -f $usermodmap ]; then - /usr/bin/xmodmap $usermodmap + xmodmap $usermodmap fi -# start some nice programs +# start fvwm95 + +if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then + ck-launch-session $dbus_cmd /usr/bin/fvwm95 +else + $dbus_cmd /usr/bin/fvwm95 +fi -exec /usr/bin/fvwm95 |