diff options
Diffstat (limited to 'util')
-rw-r--r-- | util/fbsetbg | 26 |
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 |
49 | wpsetters="${wpsetters:=fbsetroot Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg' | 49 | wpsetters="${wpsetters:=Esetroot wmsetbg feh hsetroot chbg display qiv xv xsri xli xsetbg}" # broken icewmbg' |
50 | lastwallpaper="${HOME}/.fluxbox/lastwallpaper" | 50 | lastwallpaper="${HOME}/.fluxbox/lastwallpaper" |
51 | 51 | ||
52 | 52 | ||
@@ -194,6 +194,16 @@ debugfbsetbg() { | |||
194 | exit 0 | 194 | exit 0 |
195 | } | 195 | } |
196 | 196 | ||
197 | use_fbsetroot() { | ||
198 | |||
199 | fbsetroot $wallpaper | ||
200 | if [ ! "$remember" = false ]; then | ||
201 | remembercommand | ||
202 | fi | ||
203 | exit 0 | ||
204 | } | ||
205 | |||
206 | |||
197 | if [ $# -eq 0 ]; then | 207 | if [ $# -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 | ||
359 | case $WPSETTER in | 371 | case $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 | |||
470 | fi | 479 | fi |
471 | 480 | ||
472 | 481 | ||
473 | if [ "$option" = fbsetroot ]; then | ||
474 | fbsetroot $wallpaper | ||
475 | if [ ! "$remember" = false ]; then | ||
476 | remembercommand | ||
477 | fi | ||
478 | exit 0 | ||
479 | fi | ||
480 | |||
481 | |||
482 | # random wallpaper code | 482 | # random wallpaper code |
483 | if [ "$option" = random ]; then | 483 | if [ "$option" = random ]; then |
484 | # Lets make one thing clear... | 484 | # Lets make one thing clear... |