1 files changed, 54 insertions, 38 deletions

diff --git a/src/IconBar.hh b/src/IconBar.hh
index f6b7509..8a30f55 100644
--- a/src/IconBar.hh
+++ b/src/IconBar.hh
@@ -1,5 +1,5 @@
-// IconBar.hh
-// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
+// IconBar.hh for Fluxbox Window Manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -18,55 +18,71 @@
 // 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
 // DEALINGS IN THE SOFTWARE.
-#ifndef _ICONBAR_HH_
-#define _ICONBAR_HH_
 
-#include <vector>
+// $Id: IconBar.hh,v 1.10 2003/02/23 00:50:53 fluxgen Exp $
+
+#ifndef ICONBAR_HH
+#define ICONBAR_HH
+
 #include "Window.hh"
-#include "LinkedList.hh"
 
-class Fluxbox;
+#include <list>
 
+/**
+        Icon object in IconBar
+*/
 class IconBarObj
 {
 public: 
-        IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin);
-        ~IconBarObj();
-        inline Window getIconWin(void) { return m_iconwin; }
-        inline FluxboxWindow *getFluxboxWin(void)  { return m_fluxboxwin; }
+    IconBarObj(FluxboxWindow *fluxboxwin, Window iconwin);
+    ~IconBarObj();
+    Window getIconWin() const { return m_iconwin; }
+    FluxboxWindow *getFluxboxWin() { return m_fluxboxwin; }
+    const FluxboxWindow *getFluxboxWin() const { return m_fluxboxwin; }
+    unsigned int width() const;
+    unsigned int height() const;
 private:
-        Window m_iconwin;
-        FluxboxWindow *m_fluxboxwin;
+    FluxboxWindow *m_fluxboxwin;
+    Window m_iconwin;
 };
 
-typedef LinkedList<IconBarObj> IconList;
-typedef LinkedListIterator<IconBarObj> IconListIterator;
-
+/**
+        Icon container
+*/
 class IconBar
 {
 public:
-        IconBar(BScreen *scrn, Window parent);
-        ~IconBar();
-        void draw();
-        void reconfigure();
-        Window addIcon(FluxboxWindow *fluxboxwin);
-        Window delIcon(FluxboxWindow *fluxboxwin);
-        void buttonPressEvent(XButtonEvent *be);        
-        FluxboxWindow *findWindow(Window w);
-        void exposeEvent(XExposeEvent *ee);
+    IconBar(BScreen *scrn, Window parent, FbTk::Font &font);
+    ~IconBar();
+    void draw(); //TODO
+    void reconfigure();
+    Window addIcon(FluxboxWindow *fluxboxwin);
+    Window delIcon(FluxboxWindow *fluxboxwin);
+    void buttonPressEvent(XButtonEvent *be);    
+    FluxboxWindow *findWindow(Window w);
+    IconBarObj *findIcon(FluxboxWindow * const fluxboxwin);
+    const IconBarObj *findIcon(const FluxboxWindow * const fluxboxwin) const;
+    void exposeEvent(XExposeEvent *ee);
+
+    void draw(const IconBarObj * const obj, int width) const;
+    void setVertical(bool value) { m_vertical = value; }
 private:
-        void draw(IconBarObj *obj, int width);
-        void loadTheme(unsigned int width, unsigned int height);
-        void decorate(Window win);
-        IconBarObj *findIcon(FluxboxWindow *fluxboxwin);
-        void repositionIcons(void);
-        Window createIconWindow(FluxboxWindow *fluxboxwin, Window parent);
-        BScreen *m_screen;
-        Display *m_display;
-        Window m_parent;
-        IconList *m_iconlist;   
-        Pixmap m_focus_pm;
-        unsigned long m_focus_pixel;
+    typedef std::list<IconBarObj *> IconList;
+
+//      void draw(IconBarObj *obj, int width);
+    void loadTheme(unsigned int width, unsigned int height);
+    void decorate(Window win);
+//      IconBarObj *findIcon(FluxboxWindow *fluxboxwin);
+    void repositionIcons();
+    Window createIconWindow(FluxboxWindow *fluxboxwin, Window parent);
+    BScreen *m_screen;
+    Display *m_display;
+    Window m_parent;
+    IconList m_iconlist;        
+    Pixmap m_focus_pm;
+    unsigned long m_focus_pixel;
+    bool m_vertical;
+    FbTk::Font &m_font;
 };
 
-#endif // _ICONBAR_HH_
+#endif // ICONBAR_HH