1 files changed, 65 insertions, 55 deletions

diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 95be304..4ba3e67 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -1,6 +1,6 @@
-// fluxbox.hh for fluxbox 
-// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
-
+// fluxbox.hh for Fluxbox Window Manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // blackbox.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -22,10 +22,10 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
+// $Id: fluxbox.hh,v 1.13 2002/03/01 15:28:56 fluxgen Exp $
 
-
-#ifndef  _FLUXBOX_HH_
-#define  _FLUXBOX_HH_
+#ifndef  FLUXBOX_HH
+#define  FLUXBOX_HH
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
@@ -45,8 +45,13 @@
 #       endif // HAVE_SYS_TIME_H
 #endif // TIME_WITH_SYS_TIME
 
-//forward declaration
-class Fluxbox;
+#ifndef _RESOURCE_HH_
+#include "Resource.hh"
+#endif
+
+#ifndef _KEYS_HH_
+#include "Keys.hh"
+#endif
 
 #ifndef _BASEDISPLAY_HH_
 #include "BaseDisplay.hh"
@@ -76,10 +81,6 @@ class Fluxbox;
 #include "Toolbar.hh"
 #endif
 
-#ifndef _KEYS_HH_
-#include "Keys.hh"
-#endif
-
 #ifdef          SLIT
 #       include "Slit.hh"
 #endif // SLIT
@@ -93,11 +94,10 @@ public:
         
         static Fluxbox *instance(int m_argc=0, char **m_argv=0, char *dpy_name=0, char *rc=0);
         
-        inline bool useTabs() const { return resource.tabs; }
-//      inline TabType &getTabType() { return resource.tabtype; }
-        inline bool useIconBar() const { return resource.iconbar; }
-        inline void saveTabs(bool value) { resource.tabs = value; }
-        inline void saveIconBar(bool value) { resource.iconbar = value; }
+        inline bool useTabs() { return *m_rc_tabs; }
+        inline bool useIconBar() { return *m_rc_iconbar; }
+        inline void saveTabs(bool value) { *m_rc_tabs = value; }
+        inline void saveIconBar(bool value) { m_rc_iconbar = value; }
 #ifdef          HAVE_GETPID
         inline const Atom &getFluxboxPidAtom(void) const { return fluxbox_pid; }
         #ifdef KDE
@@ -123,30 +123,26 @@ public:
         Toolbar *searchToolbar(Window);
         Tab *searchTab(Window);
         
-        enum Titlebar{Shade=0, Minimize, Maximize, Close, Stick, Menu, Empty};          
+        enum Titlebar{SHADE=0, MINIMIZE, MAXIMIZE, CLOSE, STICK, MENU, EMPTY};          
         
-        inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return titlebar.right; }
-        inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return titlebar.left; }
-        inline const char *getStyleFilename(void) const
-                { return resource.style_file; }
-        inline const char *getRootCommand() const 
-                { return resource.root_cmd; }
-        inline const char *getMenuFilename(void) const
-                { return resource.menu_file; }
-
-        inline const int &getColorsPerChannel(void) const
-                { return resource.colors_per_channel; }
+        inline const std::vector<Fluxbox::Titlebar>& getTitlebarRight() { return *m_rc_titlebar_right; }
+        inline const std::vector<Fluxbox::Titlebar>& getTitlebarLeft() { return *m_rc_titlebar_left; }
+        inline const char *getStyleFilename(void)
+                { return m_rc_stylefile->c_str(); }
+
+        inline const char *getMenuFilename(void)
+                { return m_rc_menufile->c_str(); }
+
+        inline const int &getColorsPerChannel(void)
+                { return *m_rc_colors_per_channel; }
 
         inline const timeval &getAutoRaiseDelay(void) const
                 { return resource.auto_raise_delay; }
 
-        inline const unsigned long &getCacheLife(void) const
-                { return resource.cache_life; }
-        inline const unsigned long &getCacheMax(void) const
-                { return resource.cache_max; }
-        inline const unsigned int &getTabWidth(void) const { return resource.tabwidth; }
-        inline const unsigned int &getTabHeight(void) const { return resource.tabheight; }
-
+        inline const unsigned int getCacheLife(void)
+                { return *m_rc_cache_life * 60000; }
+        inline const unsigned int getCacheMax(void)
+                { return *m_rc_cache_max; }
 
         inline void maskWindowEvents(Window w, FluxboxWindow *bw)
                 { masked = w; masked_window = bw; }
@@ -155,8 +151,9 @@ public:
         void setFocusedWindow(FluxboxWindow *w);
         void shutdown(void);
         void load_rc(BScreen *);
+        void loadRootCommand(BScreen *);
         void loadTitlebar();
-        void saveStyleFilename(const char *);
+        void saveStyleFilename(const char *val) { m_rc_stylefile = (val == 0 ? "" : val); }
         void saveMenuFilename(const char *);
         void saveTitlebarFilename(const char *);
         void saveMenuSearch(Window, Basemenu *);
@@ -188,7 +185,7 @@ public:
 
 #ifndef  HAVE_STRFTIME
 
-        enum { B_AmericanDate = 1, B_EuropeanDate };
+        enum { B_AMERICANDATE = 1, B_EUROPEANDATE };
 #endif // HAVE_STRFTIME
         
         template <class Z>
@@ -205,32 +202,43 @@ public:
                 inline Z *getData(void) { return data; }
         };
         
+        typedef std::vector<Fluxbox::Titlebar> TitlebarList;
                 
 private:
+        void setupConfigFiles();
+        void handleButtonEvent(XButtonEvent &be);
+        void handleUnmapNotify(XUnmapEvent &ue);
+        void handleClientMessage(XClientMessageEvent &ce);
+        void handleKeyEvent(XKeyEvent &ke);     
+        void doWindowAction(Keys::KeyAction action, const int param);
+        #ifdef GNOME
+        bool checkGnomeAtoms(XClientMessageEvent &ce);
+        #endif
+        #ifdef NEWWMSPEC
+        bool checkNETWMAtoms(XClientMessageEvent &ce);
+        #endif
         typedef struct MenuTimestamp {
                 char *filename;
                 time_t timestamp;
         } MenuTimestamp;
 
         struct resource {
-                Time double_click_interval;
-
-                char *menu_file, *style_file, *titlebar_file, *keys_file, *root_cmd;
-                int colors_per_channel;
+                Time double_click_interval;             
                 timeval auto_raise_delay;
-                unsigned long cache_life, cache_max;
-                bool tabs, iconbar;
-                //TabType tabtype;
-                unsigned int tabwidth, tabheight;
         } resource;
+                
+        ResourceManager m_resourcemanager, m_screen_rm;
         
-        struct titlebar_t {
-                std::vector<Fluxbox::Titlebar> left;
-                std::vector<Fluxbox::Titlebar> right;
-        };
+        //--- Resources
+        Resource<bool> m_rc_tabs, m_rc_iconbar;
+        Resource<int> m_rc_colors_per_channel;
+        Resource<std::string> m_rc_stylefile, 
+                m_rc_menufile, m_rc_keyfile;    
         
-        titlebar_t titlebar;
-        std::vector<std::string> parseTitleArgs(const char *arg);
+        Resource<TitlebarList> m_rc_titlebar_left, m_rc_titlebar_right;
+        Resource<unsigned int> m_rc_cache_life, m_rc_cache_max;
+
+        //std::vector<std::string> parseTitleArgs(const char *arg);
         void setTitlebar(std::vector<Fluxbox::Titlebar>& dir, const char *arg);
         
         typedef DataSearch<FluxboxWindow> WindowSearch;
@@ -262,14 +270,15 @@ private:
         Atom fluxbox_pid;
 #endif // HAVE_GETPID
 
-        Bool no_focus, reconfigure_wait, reread_menu_wait;
+        bool no_focus, reconfigure_wait, reread_menu_wait;
         Time last_time;
         Window masked;
         char *rc_file, **argv;
         int argc;
         Keys *key;
-        char *expandFilename(char *filename);
-        void doWindowAction(Keys::KeyAction action);
+        //default arguments for titlebar left and right
+        static Fluxbox::Titlebar m_titlebar_left[], m_titlebar_right[];
+
 protected:
         Fluxbox(int, char **, char * = 0, char * = 0);
         char *getRcFilename();
@@ -281,6 +290,7 @@ protected:
 
         virtual void process_event(XEvent *);
         //only main should be able to creat new blackbox object
+        //TODO this must be removed!
         friend int main(int,char **);
         static Fluxbox *singleton;      //singleton object ( can only be destroyed by main )
         virtual ~Fluxbox(void);