X-Git-Url: http://git.draconx.ca/gitweb/fvwmconf.git/blobdiff_plain/0cabdc838df1c59dcf2784121797c5de11830009..5a252fccc5b2a8d3de4df8eb93924e0762c80848:/common/wallpaper

diff --git a/common/wallpaper b/common/wallpaper
index 8414eef..b858eb4 100644
--- a/common/wallpaper
+++ b/common/wallpaper
@@ -15,12 +15,20 @@ DestroyFunc MakeMenuWallpaper
 AddToFunc   MakeMenuWallpaper
  + I DestroyMenu recreate MenuWallpaper
  + I AddToMenu MenuWallpaper Wallpaper Title
- + I PipeRead '. $[FVWM_USERDIR]/scripts/bgmenu.zsh $[BGROOT] MenuWallpaper'
+ + I PipeRead 'exec $[FVWM_USERDIR]/scripts/bgmenu.zsh $[BGROOT] MenuWallpaper'
 
 DestroyFunc SetWallpaper
 AddToFunc   SetWallpaper
  + I Exec exec ln -sf "$0" "$[BGFILE]"
  + I Exec exec $[SETROOT] "$[BGFILE]"
 
-AddToFunc InitFunction
- + I Exec exec $[SETROOT] "$[BGFILE]"
+DestroyFunc SetInitialWallpaper
+AddToFunc   SetInitialWallpaper
+ + I Exec if [ -f "$[BGFILE]" ]; then \
+              $[SETROOT] "$[BGFILE]"; \
+          else \
+	      $[SETROOT] "$($[FVWM_USERDIR]/scripts/randombg.pl $[BGROOT])"; \
+	  fi
+
+AddToFunc InitFunction I SetInitialWallpaper
+AddToFunc SessionInitFunction I SetInitialWallpaper