aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2006-09-21 09:41:18 (GMT)
committermathias <mathias>2006-09-21 09:41:18 (GMT)
commit0e2a8b9a433874b98432d56883d5f54452dc5946 (patch)
tree9c3b4acbf0845ab3d668e4bf2049c24d2bdb303a
parentfa675bb367621d6e27c0660141330bffd4235447 (diff)
downloadfluxbox_paul-0e2a8b9a433874b98432d56883d5f54452dc5946.zip
fluxbox_paul-0e2a8b9a433874b98432d56883d5f54452dc5946.tar.bz2
fix for the fbsetbg-fix from yesterday
-rw-r--r--util/fbsetbg26
1 files changed, 13 insertions, 13 deletions
diff --git a/util/fbsetbg b/util/fbsetbg
index bd8c369..60118e5 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -46,7 +46,7 @@
46# _NET_CURRENT_DESKTOP 46# _NET_CURRENT_DESKTOP
47 47
48# The wallpapersetter is selected in this order 48# The wallpapersetter is selected in this order
49wpsetters="${wpsetters:=fbsetroot Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg' 49wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg'
50lastwallpaper="${HOME}/.fluxbox/lastwallpaper" 50lastwallpaper="${HOME}/.fluxbox/lastwallpaper"
51 51
52 52
@@ -194,6 +194,16 @@ debugfbsetbg() {
194 exit 0 194 exit 0
195} 195}
196 196
197use_fbsetroot() {
198
199 fbsetroot $wallpaper
200 if [ ! "$remember" = false ]; then
201 remembercommand
202 fi
203 exit 0
204}
205
206
197if [ $# -eq 0 ]; then 207if [ $# -eq 0 ]; then
198 message "no options given" 208 message "no options given"
199 display_usage 209 display_usage
@@ -263,11 +273,13 @@ while [ $# -gt 0 ]; do
263 -b) option=fbsetroot 273 -b) option=fbsetroot
264 shift 274 shift
265 wallpaper=$* 275 wallpaper=$*
276 use_fbsetroot
266 break ;; 277 break ;;
267 -B) option=fbsetroot 278 -B) option=fbsetroot
268 shift 279 shift
269 wallpaper=$* 280 wallpaper=$*
270 remember=false 281 remember=false
282 use_fbsetroot
271 break ;; 283 break ;;
272 -r) option2=$option 284 -r) option2=$option
273 option=random 285 option=random
@@ -357,9 +369,6 @@ standardok=\
357"$WPSETTER is a nice wallpapersetter. You won't have any problems." 369"$WPSETTER is a nice wallpapersetter. You won't have any problems."
358 370
359case $WPSETTER in 371case $WPSETTER in
360 fbsetroot)
361 debugstory="fbsetroot does not show any pictures."
362 ;;
363 chbg) 372 chbg)
364 full='-once -mode maximize' 373 full='-once -mode maximize'
365 tile='-once -mode tile' 374 tile='-once -mode tile'
@@ -470,15 +479,6 @@ if [ -z "$DISPLAY" ]; then
470fi 479fi
471 480
472 481
473if [ "$option" = fbsetroot ]; then
474 fbsetroot $wallpaper
475 if [ ! "$remember" = false ]; then
476 remembercommand
477 fi
478 exit 0
479fi
480
481
482# random wallpaper code 482# random wallpaper code
483if [ "$option" = random ]; then 483if [ "$option" = random ]; then
484 # Lets make one thing clear... 484 # Lets make one thing clear...