1 files changed, 154 insertions, 121 deletions

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index d6e19db..3e9878c 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -1,3 +1,6 @@
+// Toolbar.hh for Fluxbox
+// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+//
 // Toolbar.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,145 +22,175 @@
 // 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.44 2003/08/19 21:28:57 fluxgen Exp $
 
+#ifndef  TOOLBAR_HH
+#define  TOOLBAR_HH
 
-#include "Basemenu.hh"
-#include "LinkedList.hh"
 #include "Timer.hh"
-#include "IconBar.hh"
-
-
-// forward declaration
-class Toolbar;
+#include "ToolbarTheme.hh"
+#include "ToolTheme.hh"
+#include "IconbarTheme.hh"
+
+#include "EventHandler.hh"
+#include "FbWindow.hh"
+#include "ArrowButton.hh"
+#include "Observer.hh"
+#include "XLayer.hh"
+#include "XLayerItem.hh"
+#include "LayerMenu.hh"
+#include "Resource.hh"
+
+#include <memory>
+
+class BScreen;
+class Strut;
+class Container;
+class IconButton;
+class Shape;
+class ToolbarItem;
+
+namespace FbTk {
+class ImageControl;
+};
 
-class Toolbarmenu : public Basemenu {
+typedef Container IconBar;
+///     The toolbar.
+/// Handles iconbar, workspace name view and clock view
+class Toolbar: public FbTk::EventHandler, public FbTk::Observer {
+public:
+       
+    /// Toolbar placement on the screen
+    enum Placement{ 
+        // top and bottom placement
+        TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
+        BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT,
+        // left and right placement
+        LEFTCENTER, LEFTBOTTOM, LEFTTOP,
+        RIGHTCENTER, RIGHTBOTTOM, RIGHTTOP        
+    };
+
+    /// Create a toolbar on the screen with specific width
+    Toolbar(BScreen &screen, FbTk::XLayer &layer, FbTk::Menu &menu, size_t width = 200);
+
+    virtual ~Toolbar();
+
+    void raise();
+    void lower();
+    void toggleHidden();
+
+
+    void moveToLayer(int layernum);
+
+    void saveOnHead(int head);
+
+    /**
+       @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 handleEvent(XEvent &event);
+    //@}
+        
+    /// enter edit mode on workspace label
+    void edit();
+    void reconfigure();
+    void setPlacement(Placement where);
+
+    void update(FbTk::Subject *subj);
+
+    FbTk::XLayerItem &layerItem() { return m_layeritem; }
+
+    inline const FbTk::Menu &menu() const { return m_toolbarmenu; }
+    inline FbTk::Menu &menu() { return m_toolbarmenu; }
+    inline FbTk::Menu &placementMenu() { return m_placementmenu; }
+    inline const FbTk::Menu &placementMenu() const { return m_placementmenu; }
+
+    inline FbTk::Menu &layermenu() { return m_layermenu; }
+    inline const FbTk::Menu &layermenu() const { return m_layermenu; }
+
+    /// are we in workspacename editing?
+    inline bool isEditing() const { return m_editing; }
+    /// are we hidden?
+    inline bool isHidden() const { return m_hidden; }
+    /// do we auto hide the toolbar?
+    inline bool doAutoHide() const { return *m_rc_auto_hide; }
+    /// @return X window of the toolbar
+    inline const FbTk::FbWindow &window() const { return frame.window; }
+    inline BScreen &screen() { return m_screen; }
+    inline const BScreen &screen() const { return m_screen; }
+    inline unsigned int width() const { return frame.window.width(); }
+    inline unsigned int height() const { return frame.window.height(); }
+    inline unsigned int exposedHeight() const { return doAutoHide() ? frame.bevel_w : frame.height; }
+    inline int x() const { return isHidden() ? frame.x_hidden : frame.x; }
+    inline int y() const { return isHidden() ? frame.y_hidden : frame.y; }
+    inline Placement placement() const { return *m_rc_placement; }
+    /// @return pointer to iconbar if it got one, else 0
+    inline const ToolbarTheme &theme() const { return m_theme; }
+    inline ToolbarTheme &theme() { return m_theme; }
+    bool isVertical() const;
+
+    inline int getOnHead() const { return *m_rc_on_head; }
+                
 private:
-  class Placementmenu : public Basemenu {
-  private:
-    Toolbarmenu *toolbarmenu;
-
-  protected:
-    virtual void itemSelected(int, int);
+    void rearrangeItems();
 
-  public:
-    Placementmenu(Toolbarmenu *);
-  };
+    void updateIconbarGraphics();
+    void setupMenus();
+    void clearStrut();
+    void updateStrut();
 
-  Toolbar *toolbar;
-  Placementmenu *placementmenu;
+    bool m_editing;      ///< edit workspace label mode
+    bool m_hidden;       ///< hidden state
 
-  friend class Placementmenu;
-  friend class Toolbar;
+    /// Toolbar frame
+    struct Frame {
+        Frame(FbTk::EventHandler &evh, int screen_num);
+        ~Frame();
 
+        FbTk::FbWindow window;
 
-protected:
-  virtual void itemSelected(int, int);
-  virtual void internal_hide(void);
+        int x, y, x_hidden, y_hidden, grab_x, grab_y;
+        unsigned int width, height, bevel_w;
+    } frame;
+    // background pixmap
+    Pixmap m_window_pm;
 
-public:
-  Toolbarmenu(Toolbar *);
-  ~Toolbarmenu(void);
+    BScreen &m_screen; ///< screen connection
 
-  inline Basemenu *getPlacementmenu(void) { return placementmenu; }
+    FbTk::Timer m_hide_timer; ///< timer to for auto hide toolbar
+    FbTk::Menu &m_toolbarmenu;
+    FbTk::Menu m_placementmenu;
+    LayerMenu<Toolbar> m_layermenu;
 
-  void reconfigure(void);
-};
+    // themes
+    ToolbarTheme m_theme;
+    ToolTheme m_clock_theme, m_workspace_theme;
+    IconbarTheme m_iconbar_theme;
 
+    FbTk::XLayerItem m_layeritem;
+    typedef std::list<ToolbarItem *> ItemList;
+    ItemList m_item_list;
 
-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;
+    Strut *m_strut; ///< created and destroyed by BScreen
 
-  friend class HideHandler;
-  friend class Toolbarmenu;
-  friend class Toolbarmenu::Placementmenu;
+    // resources
+    FbTk::Resource<bool> m_rc_auto_hide, m_rc_maximize_over;
+    FbTk::Resource<int> m_rc_width_percent;
+    FbTk::Resource<Fluxbox::Layer> m_rc_layernum;
+    FbTk::Resource<int> m_rc_on_head;
+    FbTk::Resource<Placement> m_rc_placement;
+    FbTk::Resource<int> m_rc_height;
+    std::auto_ptr<Shape> m_shape;
 
 
-public:
-  Toolbar(BScreen *);
-  virtual ~Toolbar(void);
-        void addIcon(FluxboxWindow *w);
-        void delIcon(FluxboxWindow *w);
-        
-  inline Toolbarmenu *getMenu(void) { 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);
-#endif // HAVE_STRFTIME
-
-  virtual void timeout(void);
-
-  enum { TopLeft = 1, BottomLeft, TopCenter,
-         BottomCenter, TopRight, BottomRight };
+    bool m_resize_lock; ///< to lock rearrangeItems or not
 };
 
 
-#endif // __Toolbar_hh
+#endif // TOOLBAR_HH