Merge branch 'master' into argbtesting/argbargb

Conflicts:
	src/FbTk/FbWindow.cc

6 files changed, 31 insertions, 28 deletions

diff --git a/util/fbrun/FbRun.cc b/util/fbrun/FbRun.cc
index f98a02e..3bf83aa 100644
--- a/util/fbrun/FbRun.cc
+++ b/util/fbrun/FbRun.cc
@@ -21,11 +21,11 @@
 
 #include "FbRun.hh"
 
-#include "App.hh"
-#include "EventManager.hh"
-#include "Color.hh"
-#include "KeyUtil.hh"
-#include "FileUtil.hh"
+#include "FbTk/App.hh"
+#include "FbTk/EventManager.hh"
+#include "FbTk/Color.hh"
+#include "FbTk/KeyUtil.hh"
+#include "FbTk/FileUtil.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff --git a/util/fbrun/main.cc b/util/fbrun/main.cc
index 0bb8456..edb88ff 100644
--- a/util/fbrun/main.cc
+++ b/util/fbrun/main.cc
@@ -20,9 +20,9 @@
 // DEALINGS IN THE SOFTWARE.
 
 #include "FbRun.hh"
-#include "App.hh"
-#include "StringUtil.hh"
-#include "Color.hh"
+#include "FbTk/App.hh"
+#include "FbTk/StringUtil.hh"
+#include "FbTk/Color.hh"
 
 #ifdef XINERAMA
 extern  "C" {
diff --git a/util/fbsetbg b/util/fbsetbg
index a12d427..9047be2 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -58,7 +58,7 @@ command="`basename \"$0\"`"
 display_usage() {
     cat << EOF
 Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA] /path/to/wallpaper
-       $command [-u/-U [wallpapersetter]] [-fFcCtTaA] -r/-R /path/to/wallpaperdirectory
+       $command [-u/-U [wallpapersetter]] [-fFcCtTaA] -r/-R /path/to/directory
        $command [-b/-B fbsetrootoptions]
        $command [-lhip]
 Use \`\`$command -h'' for a complete help message.
@@ -72,17 +72,21 @@ display_help() {
 
 Options:
 
+    -u  Use specified wallpapersetter, use no argument to forget.
+
     -f  Set fullscreen wallpaper (default).
     -c  Set centered wallpaper.
     -t  Set tiled wallpaper.
     -a  Set maximized wallpaper, preserving aspect.
-        ( if your bgsetter doesn't support this
+        ( if your wallpapersetter doesn't support this
           we fall back to -f )
-    -u  Use specified wallpapersetter, use no argument to forget.
-    -b  Forward the options to fbsetroot.
+
     -r  set random wallpaper from a directory
 
-    -F,-C,-T,-A,-U,-B,-R same as uncapsed but without remembering.
+    -b  Forward the rest of the arguments to fbsetroot(1).
+        This can be used to set solid, pattern, or gradient backgrounds.
+
+    -F,-C,-T,-A,-U,-B,-R same as lower-case, but without remembering.
 
     -h  Display this help.
 
@@ -308,6 +312,7 @@ while [ $# -gt 0 ]; do
                 remember=false
                 break
             fi
+            ignore_missing_wallpaper=true
             style="style"
             shift ;;
         -Z)
@@ -521,6 +526,9 @@ fi
 
 
 if [ ! -r "$wallpaper" ]; then
+        if [ "$ignore_missing_wallpaper" == "true" ]; then
+                exit 0
+        fi
     message "Can't find wallpaper $wallpaper"
     exit 1
 fi
diff --git a/util/fbsetroot.hh b/util/fbsetroot.hh
index 5a4400f..3cc931b 100644
--- a/util/fbsetroot.hh
+++ b/util/fbsetroot.hh
@@ -27,7 +27,7 @@ namespace FbTk {
 
 class ImageControl;
 
-};
+}
 
 class fbsetroot : public FbTk::App {
 public:
diff --git a/util/fluxbox-generate_menu.in b/util/fluxbox-generate_menu.in
index aca8b08..7fb5ef7 100755
--- a/util/fluxbox-generate_menu.in
+++ b/util/fluxbox-generate_menu.in
@@ -1671,13 +1671,15 @@ append_submenu "${MULTIMEDIAMENU}"
        append_submenu "${MUSICMENU}"
                normal_find xmms noatun alsaplayer gqmpeg aumix xmixer gnome-alsamixer gmix kmix kscd \
                    grecord kmidi xplaycd soundtracker grip easytag audacity \
-                   zinf rhythmbox kaboodle beep-media-player amarok tagtool
+                   zinf rhythmbox kaboodle beep-media-player amarok tagtool \
+                   audacious bmpx
                cli_find cdcd cplay alsamixer orpheus mp3blaster
        append_menu_end
 
 
        append_submenu "${VIDEOMENU}"
-           normal_find xine aviplay gtv gmplayer xmovie xcdroast xgdb realplay xawtv fxtv ogle goggles vlc
+           normal_find xine gxine aviplay gtv gmplayer xmovie xcdroast xgdb \
+               realplay xawtv fxtv ogle goggles vlc
            find_it dvdrip append "[exec] (dvdrip) {nohup dvdrip}"
        append_menu_end
 
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 96382da..85bbbfe 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -22,8 +22,9 @@
 #include "../src/FbTk/I18n.hh"
 #include "../src/FbTk/Resource.hh"
 #include "../src/FbTk/StringUtil.hh"
+#include "../src/FbTk/FileUtil.hh"
 
-#include "../src/defaults.hh"
+#include "defaults.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -463,7 +464,7 @@ set<string> modified_files;
 // we may want to put a size limit on this cache, so it doesn't grow too big
 map<string,string> file_cache;
 
-};
+}
 
 // returns the contents of the file given, either from the cache or by reading
 // the file from disk
@@ -473,11 +474,9 @@ string read_file(const string& filename) {
     if (it != file_cache.end())
         return it->second;
 
-    struct stat s;
-    stat(filename.c_str(), &s);
-
-    if (! (s.st_mode & S_IFREG))
+    if (!FbTk::FileUtil::isRegularFile(filename.c_str())) {
         return "";
+    }
 
     // nope, we'll have to read the file
     ifstream infile(filename.c_str());
@@ -489,12 +488,6 @@ string read_file(const string& filename) {
     string linebuffer;
     while (!infile.eof()) {
         getline(infile, linebuffer);
-
-        // check if we read something at all. if its 0, its a strange file
-        // (eg a directory) or we are at the end
-        if (infile.gcount() == 0) {
-            break;
-        }
         whole_file += linebuffer + "\n";
     }
     infile.close();