Renaming of 'bsetroot' to 'fbsetroot' (Mathias)

blackbox's 'bsetroot' and fluxbox's 'bsetroot' have different syntax
nowadays and collide when you install fluxbox and blackbox. hence
the renaming.

5 files changed, 32 insertions, 32 deletions

diff --git a/util/Makefile.am b/util/Makefile.am
index 3e45aa6..58a232f 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -2,9 +2,9 @@
 SUBDIRS=                fbrun
 INCLUDES=               -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
 bin_SCRIPTS=            fbsetbg fluxbox-generate_menu startfluxbox
-bin_PROGRAMS=           bsetroot
-bsetroot_SOURCES=       bsetroot.cc bsetroot.hh
-bsetroot_LDADD=         ../src/FbRootWindow.o ../src/FbAtoms.o \
+bin_PROGRAMS=           fbsetroot
+fbsetroot_SOURCES=      fbsetroot.cc fbsetroot.hh
+fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
                         ../src/FbTk/libFbTk.a
 
 MAINTAINERCLEANFILES=   Makefile.in
@@ -16,7 +16,7 @@ all-local:	startfluxbox
 clean-local:
                 rm -f startfluxbox fluxbox-generate_menu
 
-bsetroot.o:     bsetroot.cc ../config.h $(srcdir)/bsetroot.hh \
+fbsetroot.o:    fbsetroot.cc ../config.h $(srcdir)/fbsetroot.hh \
                         $(top_srcdir)/src/FbRootWindow.hh $(top_srcdir)/src/FbAtoms.hh
 
 startfluxbox:   startfluxbox.in
diff --git a/util/fbsetbg b/util/fbsetbg
index a75f461..eaa1f9d 100644
--- a/util/fbsetbg
+++ b/util/fbsetbg
@@ -61,7 +61,7 @@ display_usage() {
     cat << EOF
 Usage: $command [-u/-U [wallpapersetter]] [-fFcCtTaA /path/to/wallpaper]
                 [-r/-R /path/to/wallpaperdirectory]
-                [-b/-B bsetrootoptions] [-l] [-h] [-i] [-p]
+                [-b/-B fbsetrootoptions] [-l] [-h] [-i] [-p]
 Use \`\`$command -h'' for a complete help message.
 
 EOF
@@ -80,7 +80,7 @@ Options:
         ( if your bgsetter doesn't support this
           we fall back to -f )
     -u  Use specified wallpapersetter, use no argument to forget.
-    -b  Forward the options to bsetroot.
+    -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.
@@ -174,7 +174,7 @@ message() {
 remembercommand() {
     grep -vs "|${DISPLAY}$" ${lastwallpaper} > ${lastwallpaper}.tmp
     mv -f ${lastwallpaper}.tmp ${lastwallpaper}
-    if [ "$option" = bsetroot ]; then
+    if [ "$option" = fbsetroot ]; then
         echo $option'|'$wallpaper'|'$DISPLAY >> $lastwallpaper
         return
     fi
@@ -262,11 +262,11 @@ while [ $# -gt 0 ]; do
             wallpaper=$2
             remember=false
             break ;;
-        -b) option=bsetroot
+        -b) option=fbsetroot
             shift
             wallpaper=$*
             break ;;
-        -B) option=bsetroot
+        -B) option=fbsetroot
             shift
             wallpaper=$*
             remember=false
@@ -461,8 +461,8 @@ if [ -z "$DISPLAY" ]; then
 fi
 
 
-if [ "$option" = bsetroot ]; then
-    bsetroot $wallpaper
+if [ "$option" = fbsetroot ]; then
+    fbsetroot $wallpaper
     if [ ! "$remember" = false ]; then
         remembercommand
     fi
diff --git a/util/bsetroot.cc b/util/fbsetroot.cc
index 56cec1a..434f150 100644
--- a/util/bsetroot.cc
+++ b/util/fbsetroot.cc
@@ -20,7 +20,7 @@
 
 // $Id$
 
-#include "bsetroot.hh"
+#include "fbsetroot.hh"
 
 #include "../src/FbTk/I18n.hh"
 #include "../src/FbTk/ImageControl.hh"
@@ -52,7 +52,7 @@
 
 using namespace std;
 
-bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
+fbsetroot::fbsetroot(int argc, char **argv, char *dpy_name)
     : FbTk::App(dpy_name), m_app_name(argv[0]) {
 
     pixmaps = (Pixmap *) 0;
@@ -121,7 +121,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
     if ((mod + sol + grd) != true) {
         _FB_USES_NLS;
         cerr<<m_app_name<<
-            _FBTEXT(bsetroot, MustSpecify, 
+            _FBTEXT(fbsetroot, MustSpecify, 
                     "Error: must specify one of: -solid, -mod, -gradient\n",
                     "user didn't give one of the required options")<<endl;
 
@@ -142,7 +142,7 @@ bsetroot::bsetroot(int argc, char **argv, char *dpy_name)
 }
 
 
-bsetroot::~bsetroot() {
+fbsetroot::~fbsetroot() {
     XKillClient(display(), AllTemporary);
 
     if (pixmaps) { // should always be true
@@ -164,7 +164,7 @@ bsetroot::~bsetroot() {
    Eterm and xchat will be able to use
    transparent background
 */
-void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
+void fbsetroot::setRootAtoms(Pixmap pixmap, int screen) {
     Atom atom_root, atom_eroot, type;
     unsigned char *data_root, *data_eroot;
     int format;
@@ -196,7 +196,7 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
 
     if (atom_root == None || atom_eroot == None) {
         _FB_USES_NLS;
-        cerr<<_FBTEXT(bsetroot, NoPixmapAtoms, "Couldn't create pixmap atoms, giving up!", "Couldn't create atoms to point at root pixmap")<<endl;
+        cerr<<_FBTEXT(fbsetroot, NoPixmapAtoms, "Couldn't create pixmap atoms, giving up!", "Couldn't create atoms to point at root pixmap")<<endl;
         exit(1);
     }
 
@@ -209,7 +209,7 @@ void bsetroot::setRootAtoms(Pixmap pixmap, int screen) {
 /**
    Draws pixmaps with a single color 
 */
-void bsetroot::solid() {
+void fbsetroot::solid() {
     register int screen = 0;
 
     pixmaps = new Pixmap[ScreenCount(display())];
@@ -244,7 +244,7 @@ void bsetroot::solid() {
  Draws pixmaps with an 16x16 pattern with
  fg and bg colors.
 */
-void bsetroot::modula(int x, int y) {
+void fbsetroot::modula(int x, int y) {
     char data[32];
     long pattern;
 
@@ -322,7 +322,7 @@ void bsetroot::modula(int x, int y) {
 /**
  draws pixmaps with a fluxbox texure
 */
-void bsetroot::gradient() {
+void fbsetroot::gradient() {
     // using temporaray pixmap and then copying it to background pixmap, as it'll
     // get crashed somewhere on the way causing apps like XChat chrashing
     // as the pixmap has been destroyed
@@ -378,12 +378,12 @@ void bsetroot::gradient() {
 /**
  Shows information about usage
 */
-void bsetroot::usage(int exit_code) {
+void fbsetroot::usage(int exit_code) {
     _FB_USES_NLS;
-    cerr<<m_app_name<<" 2.3 : (c) 2003-2004 Fluxbox Development Team"<<endl;
+    cerr<<m_app_name<<" 2.3 : (c) 2003-2005 Fluxbox Development Team"<<endl;
     cerr<<m_app_name<<" 2.1 : (c) 2002 Claes Nasten"<<endl;
     cerr<<m_app_name<<" 2.0 : (c) 1997-2000 Brad Hughes\n"<<endl;
-    cerr<<_FBTEXT(bsetroot, Usage,
+    cerr<<_FBTEXT(fbsetroot, Usage,
                   "  -display <string>        display connection\n"
                   "  -mod <x> <y>             modula pattern\n"
                   "  -foreground, -fg <color> modula foreground color\n"
@@ -393,7 +393,7 @@ void bsetroot::usage(int exit_code) {
                   "  -to <color>              gradient end color\n\n"
                   "  -solid <color>           solid color\n\n"
                   "  -help                    print this help text and exit\n",
-                  "bsetroot usage options")<<endl;
+                  "fbsetroot usage options")<<endl;
     exit(exit_code);
 }
 
@@ -421,7 +421,7 @@ int main(int argc, char **argv) {
         }
     }
  
-    bsetroot app(argc, argv, display_name);
+    fbsetroot app(argc, argv, display_name);
  
     return (0);
 }
diff --git a/util/bsetroot.hh b/util/fbsetroot.hh
index c4ad614..a66b716 100644
--- a/util/bsetroot.hh
+++ b/util/fbsetroot.hh
@@ -20,8 +20,8 @@
 
 // $Id$
 
-#ifndef BSETROOT_HH
-#define BSETROOT_HH
+#ifndef FBSETROOT_HH
+#define FBSETROOT_HH
 
 #include "../src/FbTk/App.hh"
 
@@ -31,10 +31,10 @@ class ImageControl;
 
 };
 
-class bsetroot : public FbTk::App {
+class fbsetroot : public FbTk::App {
 public:
-    bsetroot(int argc, char **argv, char * dpy_name= 0);
-    ~bsetroot();
+    fbsetroot(int argc, char **argv, char * dpy_name= 0);
+    ~fbsetroot();
 
     void gradient();
     void modula(int, int);
@@ -52,4 +52,4 @@ private:
 };
 
 
-#endif // BSETROOT_HH
+#endif // FBSETROOT_HH
diff --git a/util/startfluxbox.in b/util/startfluxbox.in
index 74f9a96..154ccdb 100755
--- a/util/startfluxbox.in
+++ b/util/startfluxbox.in
@@ -44,7 +44,7 @@ else
 #
 # This sets a black background
 
-@pkgbindir@/bsetroot -solid black
+@pkgbindir@/fbsetroot -solid black
 
 # This shows the fluxbox-splash-screen
 # fbsetbg -C @pkgdatadir@/splash.jpg