1 files changed, 45 insertions, 23 deletions

diff --git a/util/bsetroot.hh b/util/bsetroot.hh
index 1dfac2c..6683fbb 100644
--- a/util/bsetroot.hh
+++ b/util/bsetroot.hh
@@ -1,33 +1,55 @@
-#ifndef   __bsetroot2_hh
-#define   __bsetroot2_hh
-
-#include "../src/BaseDisplay.hh"
-#include "../src/Image.hh"
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen(at)linuxmail.org)
+// Copyright (c) 1997 - 2000 Brad Hughes <bhughes at trolltech.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the "Software"),
+// to deal in the Software without restriction, including without limitation
+// the rights to use, copy, modify, merge, publish, distribute, sublicense,
+// and/or sell copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+
+// $Id: bsetroot.hh,v 1.6 2003/05/10 15:44:15 fluxgen Exp $
+
+#ifndef BSETROOT_HH
+#define BSETROOT_HH
+
+#include "../src/FbTk/App.hh"
+
+namespace FbTk {
+
+class ImageControl;
 
+};
 
-class bsetroot : public BaseDisplay {
+class bsetroot : public FbTk::App {
 public:
-        bsetroot(int, char **, char * = 0);
-        ~bsetroot(void);
+    bsetroot(int argc, char **argv, char * dpy_name= 0);
+    ~bsetroot();
 
-        inline virtual Bool handleSignal(int) { return False; }
+    void gradient();
+    void modula(int, int);
+    void solid();
+    void usage(int = 0);
+    void setRootAtoms(Pixmap pixmap, int screen);
 
-        void gradient(void);
-        void modula(int, int);
-        void solid(void);
-        void usage(int = 0);
-        
 private:
-        BImageControl **img_ctrl;
-        Pixmap *pixmaps;
-
-        char *fore, *back, *grad;
-        Display *display;
-        int num_screens;
-protected:
-        inline virtual void process_event(XEvent *) { }
+    FbTk::ImageControl **img_ctrl;
+    Pixmap *pixmaps;
 
+    char *fore, *back, *grad;
+    int num_screens;
+    char *m_app_name;
 };
 
 
-#endif // __bsetroot2_hh
+#endif // BSETROOT_HH