fix for the fbsetbg-fix from yesterday

This commit is contained in:
mathias 2006-09-21 09:41:18 +00:00
parent fa675bb367
commit 0e2a8b9a43

View file

@ -46,7 +46,7 @@
# _NET_CURRENT_DESKTOP # _NET_CURRENT_DESKTOP
# The wallpapersetter is selected in this order # The wallpapersetter is selected in this order
wpsetters="${wpsetters:=fbsetroot Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg' wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg'
lastwallpaper="${HOME}/.fluxbox/lastwallpaper" lastwallpaper="${HOME}/.fluxbox/lastwallpaper"
@ -194,6 +194,16 @@ debugfbsetbg() {
exit 0 exit 0
} }
use_fbsetroot() {
fbsetroot $wallpaper
if [ ! "$remember" = false ]; then
remembercommand
fi
exit 0
}
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
message "no options given" message "no options given"
display_usage display_usage
@ -263,11 +273,13 @@ while [ $# -gt 0 ]; do
-b) option=fbsetroot -b) option=fbsetroot
shift shift
wallpaper=$* wallpaper=$*
use_fbsetroot
break ;; break ;;
-B) option=fbsetroot -B) option=fbsetroot
shift shift
wallpaper=$* wallpaper=$*
remember=false remember=false
use_fbsetroot
break ;; break ;;
-r) option2=$option -r) option2=$option
option=random option=random
@ -357,9 +369,6 @@ standardok=\
"$WPSETTER is a nice wallpapersetter. You won't have any problems." "$WPSETTER is a nice wallpapersetter. You won't have any problems."
case $WPSETTER in case $WPSETTER in
fbsetroot)
debugstory="fbsetroot does not show any pictures."
;;
chbg) chbg)
full='-once -mode maximize' full='-once -mode maximize'
tile='-once -mode tile' tile='-once -mode tile'
@ -470,15 +479,6 @@ if [ -z "$DISPLAY" ]; then
fi fi
if [ "$option" = fbsetroot ]; then
fbsetroot $wallpaper
if [ ! "$remember" = false ]; then
remembercommand
fi
exit 0
fi
# random wallpaper code # random wallpaper code
if [ "$option" = random ]; then if [ "$option" = random ]; then
# Lets make one thing clear... # Lets make one thing clear...