1 files changed, 122 insertions, 122 deletions

diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index ce7dbd1..259e23d 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.hh,v 1.14 2002/11/27 12:20:23 fluxgen Exp $
+// $Id: Toolbar.hh,v 1.15 2002/12/01 13:42:02 rathnor Exp $
 
 #ifndef  TOOLBAR_HH
 #define  TOOLBAR_HH
@@ -41,48 +41,48 @@ class Toolbar;
 */
 class Toolbarmenu:public Basemenu {
 public:
-        explicit Toolbarmenu(Toolbar &tb);
-        ~Toolbarmenu();
+    explicit Toolbarmenu(Toolbar &tb);
+    ~Toolbarmenu();
 
-        inline const Basemenu *headmenu() const { return m_headmenu.get(); }
+    inline const Basemenu *headmenu() const { return m_headmenu.get(); }
 
-        inline Basemenu *placementmenu() { return &m_placementmenu; }
-        inline const Basemenu *placementmenu() const { return &m_placementmenu; }
+    inline Basemenu *placementmenu() { return &m_placementmenu; }
+    inline const Basemenu *placementmenu() const { return &m_placementmenu; }
 
-        void reconfigure();
+    void reconfigure();
 
 protected:
-        virtual void itemSelected(int button, unsigned int index);
-        virtual void internal_hide();
+    virtual void itemSelected(int button, unsigned int index);
+    virtual void internal_hide();
 
 private:
-        class Placementmenu : public Basemenu {
-        public:
-                Placementmenu(Toolbarmenu &tm);
-        protected:
-                virtual void itemSelected(int button, unsigned int index);
-        private:
-                Toolbarmenu &m_toolbarmenu;
-        };
-        friend class Placementmenu;
-
-        class Headmenu : public Basemenu {
-        public:
-                Headmenu(Toolbarmenu &tm);
-        protected:
-                virtual void itemSelected(int button, unsigned int index); 
-        private:
-                Toolbarmenu &m_toolbarmenu;
-        };
-        std::auto_ptr<Headmenu> m_headmenu;
-        friend class Headmenu;
+    class Placementmenu : public Basemenu {
+    public:
+        Placementmenu(Toolbarmenu &tm);
+    protected:
+        virtual void itemSelected(int button, unsigned int index);
+    private:
+        Toolbarmenu &m_toolbarmenu;
+    };
+    friend class Placementmenu;
+
+    class Headmenu : public Basemenu {
+    public:
+        Headmenu(Toolbarmenu &tm);
+    protected:
+        virtual void itemSelected(int button, unsigned int index); 
+    private:
+        Toolbarmenu &m_toolbarmenu;
+    };
+    std::auto_ptr<Headmenu> m_headmenu;
+    friend class Headmenu;
  
 
-        Toolbar &m_toolbar;
-        Placementmenu m_placementmenu;
+    Toolbar &m_toolbar;
+    Placementmenu m_placementmenu;
 
         
-        friend class Toolbar;
+    friend class Toolbar;
 
 };
 
@@ -91,106 +91,106 @@ private:
 */
 class Toolbar : public TimeoutHandler {
 public:
-        /**
-                Toolbar placement on the screen
-        */
-        enum Placement{ TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
-                BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT };
-
-        explicit Toolbar(BScreen *screen);
-        virtual ~Toolbar();
-
-        /// add icon to iconbar
-        void addIcon(FluxboxWindow *w);
-        /// remove icon from iconbar
-        void delIcon(FluxboxWindow *w);
+    /**
+       Toolbar placement on the screen
+    */
+    enum Placement{ TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
+                    BOTTOMCENTER, TOPRIGHT, BOTTOMRIGHT };
+
+    explicit Toolbar(BScreen *screen);
+    virtual ~Toolbar();
+
+    /// add icon to iconbar
+    void addIcon(FluxboxWindow *w);
+    /// remove icon from iconbar
+    void delIcon(FluxboxWindow *w);
         
-        inline const Toolbarmenu &menu() const { return m_toolbarmenu; }
-        /// 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 BScreen *screen() { return m_screen; }
-        inline const BScreen *screen() const { return m_screen; }
-        inline unsigned int width() const { return frame.width; }
-        inline unsigned int height() const { return frame.height; }
-        inline unsigned int exposedHeight() 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); }
-        /// @return pointer to iconbar if it got one, else 0
-        inline const IconBar *iconBar()  const { return m_iconbar.get(); }
-        /**
-                @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);
-        //@}
+    inline const Toolbarmenu &menu() const { return m_toolbarmenu; }
+    /// 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 BScreen *screen() { return m_screen; }
+    inline const BScreen *screen() const { return m_screen; }
+    inline unsigned int width() const { return frame.width; }
+    inline unsigned int height() const { return frame.height; }
+    inline unsigned int exposedHeight() 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); }
+    /// @return pointer to iconbar if it got one, else 0
+    inline const IconBar *iconBar()  const { return m_iconbar.get(); }
+    /**
+       @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();
+    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();
 
-        void checkClock(bool redraw = false, bool date = false);
+    void checkClock(bool redraw = false, bool date = false);
 
-        virtual void timeout();
+    virtual void timeout();
 
                 
 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 *m_screen;
-        BImageControl *image_ctrl; 
-        BTimer clock_timer; ///< timer to update clock
-        BTimer hide_timer; ///< timer to for auto hide toolbar
-        Toolbarmenu m_toolbarmenu;
-        std::auto_ptr<IconBar> m_iconbar;
+    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 *m_screen;
+    BImageControl *image_ctrl; 
+    BTimer clock_timer; ///< timer to update clock
+    BTimer hide_timer; ///< timer to for auto hide toolbar
+    Toolbarmenu m_toolbarmenu;
+    std::auto_ptr<IconBar> m_iconbar;
         
-        std::string new_workspace_name; ///< temp variable in edit workspace name mode
+    std::string new_workspace_name; ///< temp variable in edit workspace name mode
 
-        friend class HideHandler;
-        friend class Toolbarmenu;
-        friend class Toolbarmenu::Placementmenu;
+    friend class HideHandler;
+    friend class Toolbarmenu;
+    friend class Toolbarmenu::Placementmenu;
 
-        friend class Toolbarmenu::Headmenu;
+    friend class Toolbarmenu::Headmenu;
 };