1 files changed, 158 insertions, 112 deletions

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index d6e19db..29756d5 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -1,3 +1,6 @@
+// Toolbar.hh for Fluxbox
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // Toolbar.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,145 +22,188 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   _TOOLBAR_HH_
-#define   _TOOLBAR_HH_
-
-#include <X11/Xlib.h>
-
-
+// $Id: Toolbar.hh,v 1.13 2002/11/15 12:04:27 fluxgen Exp $
 
+#ifndef  TOOLBAR_HH
+#define  TOOLBAR_HH
 
 #include "Basemenu.hh"
-#include "LinkedList.hh"
 #include "Timer.hh"
 #include "IconBar.hh"
 
 
-// forward declaration
 class Toolbar;
 
-class Toolbarmenu : public Basemenu {
-private:
-  class Placementmenu : public Basemenu {
-  private:
-    Toolbarmenu *toolbarmenu;
-
-  protected:
-    virtual void itemSelected(int, int);
-
-  public:
-    Placementmenu(Toolbarmenu *);
-  };
-
-  Toolbar *toolbar;
-  Placementmenu *placementmenu;
+/**
+        Menu for toolbar.
+        @see Toolbar
+*/
+class Toolbarmenu:public Basemenu {
+public:
+        explicit Toolbarmenu(Toolbar *tb);
+        ~Toolbarmenu();
+        #ifdef XINERAMA
+        inline Basemenu *getHeadmenu() { return headmenu; }
+        #endif // XINERAMA
 
-  friend class Placementmenu;
-  friend class Toolbar;
+        inline Basemenu *getPlacementmenu() { return placementmenu; }
+        inline const Basemenu *getPlacementmenu() const { return placementmenu; }
 
+        void reconfigure();
 
 protected:
-  virtual void itemSelected(int, int);
-  virtual void internal_hide(void);
+        virtual void itemSelected(int button, unsigned int index);
+        virtual void internal_hide();
 
-public:
-  Toolbarmenu(Toolbar *);
-  ~Toolbarmenu(void);
-
-  inline Basemenu *getPlacementmenu(void) { return placementmenu; }
+private:
+        class Placementmenu : public Basemenu {
+        private:
+                Toolbarmenu *toolbarmenu;
+
+        protected:
+                virtual void itemSelected(int button, unsigned int index);
+
+        public:
+                Placementmenu(Toolbarmenu *);
+        };
+
+#ifdef XINERAMA
+        class Headmenu : public Basemenu {
+        public:
+                Headmenu(Toolbarmenu *);
+        private:
+                Toolbarmenu *toolbarmenu;
+
+        protected:
+                virtual void itemSelected(int button, unsigned int index); 
+        };
+        Headmenu *headmenu;
+        friend class Headmenu;
+#endif // XINERAMA
+ 
+
+        Toolbar *toolbar;
+        Placementmenu *placementmenu;
+
+        friend class Placementmenu;
+        friend class Toolbar;
 
-  void reconfigure(void);
 };
 
-
+/**
+        the toolbar.
+*/
 class Toolbar : public TimeoutHandler {
-private:
-  Bool on_top, editing, hidden, do_auto_hide;
-  Display *display;
-
-  struct frame {
-    unsigned long button_pixel, pbutton_pixel;
-    Pixmap base, label, wlabel, clk, button, pbutton;
-    Window window, workspace_label, window_label, clock, psbutton, nsbutton,
-      pwbutton, nwbutton;
-
-    int x, y, x_hidden, y_hidden, hour, minute, grab_x, grab_y;
-    unsigned int width, height, window_label_w, workspace_label_w, clock_w,
-      button_w, bevel_w, label_h;
-  } frame;
-
-  class HideHandler : public TimeoutHandler {
-  public:
-    Toolbar *toolbar;
-
-    virtual void timeout(void);
-  } hide_handler;
-
-  Fluxbox *fluxbox;
-  BImageControl *image_ctrl;
-  BScreen *screen;
-  BTimer *clock_timer, *hide_timer;
-  Toolbarmenu *toolbarmenu;
-        class IconBar *iconbar;
-        
-  char *new_workspace_name, *new_name_pos;
-
-  friend class HideHandler;
-  friend class Toolbarmenu;
-  friend class Toolbarmenu::Placementmenu;
+public:
+        /**
+                Toolbar placement on the screen
+        */
+        enum Placement{ TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
+                BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT };
 
+        explicit Toolbar(BScreen *screen);
+        virtual ~Toolbar();
 
-public:
-  Toolbar(BScreen *);
-  virtual ~Toolbar(void);
+        /// add icon to iconbar
         void addIcon(FluxboxWindow *w);
+        /// remove icon from iconbar
         void delIcon(FluxboxWindow *w);
         
-  inline Toolbarmenu *getMenu(void) { return toolbarmenu; }
+        inline Toolbarmenu *getMenu() { return toolbarmenu; }
+        inline const Toolbarmenu *getMenu() const { return toolbarmenu; }
+
         //inline Window getWindowLabel(void) { return frame.window_label; }
-  inline const Bool &isEditing(void) const { return editing; }
-  inline const Bool &isOnTop(void) const { return on_top; }
-  inline const Bool &isHidden(void) const { return hidden; }
-  inline const Bool &doAutoHide(void) const { return do_auto_hide; }
-
-  inline const Window &getWindowID(void) const { return frame.window; }
-
-  inline const unsigned int &getWidth(void) const { return frame.width; }
-  inline const unsigned int &getHeight(void) const { return frame.height; }
-  inline const unsigned int &getExposedHeight(void) const
-  { return ((do_auto_hide) ? frame.bevel_w : frame.height); }
-  inline const int &getX(void) const
-  { return ((hidden) ? frame.x_hidden : frame.x); }
-  inline const int &getY(void) const
-  { return ((hidden) ? frame.y_hidden : frame.y); }
-
-  void buttonPressEvent(XButtonEvent *);
-  void buttonReleaseEvent(XButtonEvent *);
-  void enterNotifyEvent(XCrossingEvent *);
-  void leaveNotifyEvent(XCrossingEvent *);
-  void exposeEvent(XExposeEvent *);
-  void keyPressEvent(XKeyEvent *);
-
-  void redrawWindowLabel(Bool = False);
-  void redrawWorkspaceLabel(Bool = False);
-  void redrawPrevWorkspaceButton(Bool = False, Bool = False);
-  void redrawNextWorkspaceButton(Bool = False, Bool = False);
-  void redrawPrevWindowButton(Bool = False, Bool = False);
-  void redrawNextWindowButton(Bool = False, Bool = False);
-  void edit(void);
-  void reconfigure(void);
-
-#ifdef    HAVE_STRFTIME
-  void checkClock(Bool = False);
-#else //  HAVE_STRFTIME
-  void checkClock(Bool = False, Bool = False);
+        
+        /// are we in workspacename editing?
+        inline bool isEditing() const { return editing; }
+        /// always on top?
+        inline bool isOnTop() const { return on_top; }
+        /// are we hidden?
+        inline bool isHidden() const { return hidden; }
+        /// do we auto hide the toolbar?
+        inline bool doAutoHide() const { return do_auto_hide; }
+        /**
+                @return X window of the toolbar
+        */
+        inline Window getWindowID() const { return frame.window; }
+
+        inline unsigned int width() const { return frame.width; }
+        inline unsigned int height() const { return frame.height; }
+        inline unsigned int getExposedHeight() const { return ((do_auto_hide) ? frame.bevel_w : frame.height); }
+        inline int x() const { return ((hidden) ? frame.x_hidden : frame.x); }
+        inline int y() const { return ((hidden) ? frame.y_hidden : frame.y); }
+        inline const IconBar *iconBar()  const { return iconbar; }
+        /**
+                @name eventhandlers
+        */
+        //@{
+        void buttonPressEvent(XButtonEvent *be);
+        void buttonReleaseEvent(XButtonEvent *be);
+        void enterNotifyEvent(XCrossingEvent *ce);
+        void leaveNotifyEvent(XCrossingEvent *ce);
+        void exposeEvent(XExposeEvent *ee);
+        void keyPressEvent(XKeyEvent *ke);
+        //@}
+        
+        void redrawWindowLabel(bool redraw= false);
+        void redrawWorkspaceLabel(bool redraw= false);
+        void redrawPrevWorkspaceButton(bool pressed = false, bool redraw = false);
+        void redrawNextWorkspaceButton(bool pressed = false, bool redraw = false);
+        void redrawPrevWindowButton(bool pressed = false, bool redraw = false);
+        void redrawNextWindowButton(bool pressed = false, bool redraw = false);
+        /// enter edit mode on workspace label
+        void edit();
+        void reconfigure();
+
+#ifdef HAVE_STRFTIME
+        void checkClock(bool redraw = false);
+#else // HAVE_STRFTIME
+        void checkClock(bool redraw = false, bool date = false);
 #endif // HAVE_STRFTIME
 
-  virtual void timeout(void);
+        virtual void timeout();
 
-  enum { TopLeft = 1, BottomLeft, TopCenter,
-         BottomCenter, TopRight, BottomRight };
+                
+private:
+        bool on_top;       ///< always on top
+        bool editing;      ///< edit workspace label mode
+        bool hidden;       ///< hidden state
+        bool do_auto_hide; ///< do we auto hide 
+        Display *display;  ///< display connection
+
+        struct frame {
+                unsigned long button_pixel, pbutton_pixel;
+                Pixmap base, label, wlabel, clk, button, pbutton;
+                Window window, workspace_label, window_label, clock, psbutton, nsbutton,
+                        pwbutton, nwbutton;
+
+                int x, y, x_hidden, y_hidden, hour, minute, grab_x, grab_y;
+                unsigned int width, height, window_label_w, workspace_label_w, clock_w,
+                        button_w, bevel_w, label_h;
+        } frame;
+
+        class HideHandler : public TimeoutHandler {
+        public:
+                Toolbar *toolbar;
+
+                virtual void timeout();
+        } hide_handler;
+
+        BScreen *screen;
+        BImageControl *image_ctrl; 
+        BTimer clock_timer, hide_timer;
+        Toolbarmenu *toolbarmenu;
+        IconBar *iconbar;
+        
+        std::string new_workspace_name; ///< temp variable in edit workspace name mode
+
+        friend class HideHandler;
+        friend class Toolbarmenu;
+        friend class Toolbarmenu::Placementmenu;
+        #ifdef XINERAMA
+        friend class Toolbarmenu::Headmenu;
+        #endif // XINERAMA
 };
 
 
-#endif // __Toolbar_hh
+#endif // TOOLBAR_HH