1 files changed, 131 insertions, 149 deletions

diff --git a/src/Basemenu.hh b/src/Basemenu.hh
index 27aed54..137eb8e 100644
--- a/src/Basemenu.hh
+++ b/src/Basemenu.hh
@@ -1,3 +1,6 @@
+// Basemenu.hh for Fluxbox Window manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // Basemenu.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,174 +22,153 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   __Basemenu_hh
-#define   __Basemenu_hh
+// $Id: Basemenu.hh,v 1.14 2002/05/19 12:57:47 fluxgen Exp $
+
+#ifndef  BASEMENU_HH
+#define  BASEMENU_HH
 
 #include <X11/Xlib.h>
+#include <vector>
+#include <string>
 
-// forward declarations
 class Basemenu;
 class BasemenuItem;
-
 class Fluxbox;
 class BImageControl;
 class BScreen;
 
-#include "LinkedList.hh"
-
-
 class Basemenu {
-private:
-  LinkedList<BasemenuItem> *menuitems;
-  Fluxbox *fluxbox;
-  Basemenu *parent;
-  BImageControl *image_ctrl;
-  BScreen *screen;
-
-  Bool moving, visible, movable, torn, internal_menu, title_vis, shifted,
-    hide_tree;
-  Display *display;
-  int which_sub, which_press, which_sbl, alignment;
-
-  struct _menu {
-    Pixmap frame_pixmap, title_pixmap, hilite_pixmap, sel_pixmap;
-    Window window, frame, title;
+public:
+        enum Alignment{ ALIGNDONTCARE = 1, ALIGNTOP, ALIGNBOTTOM };
+        enum { RIGHT = 1, LEFT };
+        enum { EMPTY = 0, SQUARE, TRIANGLE, DIAMOND };
+        
+        explicit Basemenu(BScreen *screen);
+        virtual ~Basemenu();
+
+        //manipulators
+        int insert(const char *label, int function= 0, const char *exec = 0, int pos = -1);
+        int insert(const char *label, Basemenu *submenu, int pos= -1);
+        int remove(unsigned int item);
+        inline void setInternalMenu() { internal_menu = true; }
+        inline void setAlignment(Alignment a) { m_alignment = a; }
+        inline void setTorn() { torn = true; }
+        inline void removeParent() { if (internal_menu) m_parent = 0; }
+        void buttonPressEvent(XButtonEvent *);
+        void buttonReleaseEvent(XButtonEvent *);
+        void motionNotifyEvent(XMotionEvent *);
+        void enterNotifyEvent(XCrossingEvent *);
+        void leaveNotifyEvent(XCrossingEvent *);
+        void exposeEvent(XExposeEvent *);
+        void reconfigure();
+        void setLabel(const char *labelstr);
+        void move(int x, int y);
+        void update();
+        void setItemSelected(unsigned int index, bool val);
+        void setItemEnabled(unsigned int index, bool val);
+        virtual void drawSubmenu(unsigned int index);
+        virtual void show();
+        virtual void hide();
+        
+        //accessors
+        inline  bool isTorn() const { return torn; }
+        inline  bool isVisible() const { return visible; }
+        inline BScreen *screen() const { return m_screen; }
+        inline Window windowID() const { return menu.window; }
+        inline const std::string &label() const { return menu.label; }  
+        inline int x() const { return menu.x; }
+        inline int y() const { return menu.y; }
+        inline unsigned int width() const { return menu.width; }
+        inline unsigned int height() const { return menu.height; }
+        inline unsigned int numberOfItems() const { return menuitems.size(); }
+        inline int currentSubmenu() const { return which_sub; } 
+        inline unsigned int titleHeight() const { return menu.title_h; }
+        bool hasSubmenu(unsigned int index) const;
+        bool isItemSelected(unsigned int index) const;
+        bool isItemEnabled(unsigned int index) const;
 
-    char *label;
-    int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub,
-      grab_x, grab_y;
-    unsigned int width, height, title_h, frame_h, item_w, item_h, bevel_w,
-      bevel_h;
-  } menu;
+private:
+        typedef std::vector<BasemenuItem *> Menuitems;
+        Fluxbox *m_fluxbox;
+        BScreen *m_screen;
+        Display *m_display;
+        Basemenu *m_parent;
+        BImageControl *m_image_ctrl;
+        Menuitems menuitems;
+        
+        bool moving, visible, movable, torn, internal_menu, title_vis, shifted,
+                hide_tree;
+        
+        int which_sub, which_press, which_sbl;
+        Alignment m_alignment;
+
+        struct _menu {
+                Pixmap frame_pixmap, title_pixmap, hilite_pixmap, sel_pixmap;
+                Window window, frame, title;
+
+                std::string label;
+                int x, y, x_move, y_move, x_shift, y_shift, sublevels, persub, minsub,
+                        grab_x, grab_y;
+                unsigned int width, height, title_h, frame_h, item_w, item_h, bevel_w,
+                        bevel_h;
+        } menu;
 
 
 protected:
-  inline BasemenuItem *find(int index) { return menuitems->find(index); }
-  inline void setTitleVisibility(Bool b) { title_vis = b; }
-  inline void setMovable(Bool b) { movable = b; }
-  inline void setHideTree(Bool h) { hide_tree = h; }
-  inline void setMinimumSublevels(int m) { menu.minsub = m; }
-
-  virtual void itemSelected(int, int) = 0;
-  virtual void drawItem(int, Bool = False, Bool = False,
-                        int = -1, int = -1, unsigned int = 0, unsigned int = 0);
-  virtual void redrawTitle();
-  virtual void internal_hide(void);
-
-
-public:
-  Basemenu(BScreen *);
-  virtual ~Basemenu(void);
-
-  inline const Bool &isTorn(void) const { return torn; }
-  inline const Bool &isVisible(void) const { return visible; }
-
-  inline BScreen *getScreen(void) { return screen; }
-
-  inline const Window &getWindowID(void) const { return menu.window; }
-
-  inline const char *getLabel(void) const { return menu.label; }
-
-  int insert(const char *, int = 0, const char * = (const char *) 0, int = -1);
-  int insert(const char **, int = -1, int = 0);
-  int insert(const char *, Basemenu *, int = -1);
-  int remove(int);
-
-  inline const int &getX(void) const { return menu.x; }
-  inline const int &getY(void) const { return menu.y; }
-  inline int getCount(void) { return menuitems->count(); }
-  inline const int &getCurrentSubmenu(void) const { return which_sub; }
-
-  inline const unsigned int &getWidth(void) const { return menu.width; }
-  inline const unsigned int &getHeight(void) const { return menu.height; }
-  inline const unsigned int &getTitleHeight(void) const { return menu.title_h; }
-
-  inline void setInternalMenu(void) { internal_menu = True; }
-  inline void setAlignment(int a) { alignment = a; }
-  inline void setTorn(void) { torn = True; }
-  inline void removeParent(void)
-    { if (internal_menu) parent = (Basemenu *) 0; }
-
-  Bool hasSubmenu(int);
-  Bool isItemSelected(int);
-  Bool isItemEnabled(int);
-
-  void buttonPressEvent(XButtonEvent *);
-  void buttonReleaseEvent(XButtonEvent *);
-  void motionNotifyEvent(XMotionEvent *);
-  void enterNotifyEvent(XCrossingEvent *);
-  void leaveNotifyEvent(XCrossingEvent *);
-  void exposeEvent(XExposeEvent *);
-  void reconfigure(void);
-  void setLabel(const char *n);
-  void move(int, int);
-  void update(void);
-  void setItemSelected(int, Bool);
-  void setItemEnabled(int, Bool);
-
-  virtual void drawSubmenu(int);
-  virtual void show(void);
-  virtual void hide(void);
-
-  enum { AlignDontCare = 1, AlignTop, AlignBottom };
-  enum { Right = 1, Left };
-  enum { Empty = 0, Square, Triangle, Diamond };
+        inline BasemenuItem *find(unsigned int index) const { return menuitems[index]; }
+        inline void setTitleVisibility(bool b) { title_vis = b; }
+        inline void setMovable(bool b) { movable = b; }
+        inline void setHideTree(bool h) { hide_tree = h; }
+        inline void setMinimumSublevels(int m) { menu.minsub = m; }
+
+        virtual void itemSelected(int button, unsigned int index) = 0;
+        virtual void drawItem(unsigned int index, bool highlight= false, bool clear= false,
+                        int x= -1, int y= -1, unsigned int width= 0, unsigned int height= 0);
+        virtual void redrawTitle();
+        virtual void internal_hide();
 };
 
-
 class BasemenuItem {
-private:
-  Basemenu *s;
-  const char **u, *l, *e;
-  int f, enabled, selected;
-
-  friend class Basemenu;
-
-
-protected:
+public:
+        BasemenuItem(
+                        const char *label,
+                        int function,
+                        const char *exec = (const char *) 0)
+                : m_label(label ? label : "")
+                , m_exec(exec ? exec : "")
+                , m_submenu(0)
+                , m_function(function)
+                , m_enabled(true)
+                , m_selected(false)
+        { }
+
+        BasemenuItem(const char *label, Basemenu *submenu)
+                : m_label(label ? label : "")
+                , m_exec("")
+                , m_submenu(submenu)
+                , m_function(0)
+                , m_enabled(true)
+                , m_selected(false)
+        { }
+
+        inline const std::string &exec() const { return m_exec; }
+        inline const std::string &label() const { return m_label; }
+        inline int function() const { return m_function; }
+        inline Basemenu *submenu() const { return m_submenu; }
+
+        inline bool isEnabled() const { return m_enabled; }
+        inline void setEnabled(bool enabled) { m_enabled = enabled; }
+        inline bool isSelected() const { return m_selected; }
+        inline void setSelected(bool selected) { m_selected = selected; }
 
+private:
+        std::string m_label, m_exec;
+        Basemenu *m_submenu;
+        int m_function;
+        bool m_enabled, m_selected;
 
-public:
-  BasemenuItem(const char *lp, int fp, const char *ep = (const char *) 0) {
-    l = lp;
-    e = ep;
-    s = 0;
-    f = fp;
-    u = 0;
-    enabled = 1;
-    selected = 0;
-  }
-
-  BasemenuItem(const char *lp, Basemenu *mp) {
-    l = lp;
-    s = mp;
-    e = 0;
-    f = 0;
-    u = 0;
-    enabled = 1;
-    selected = 0;
-  }
-
-  BasemenuItem(const char **up, int fp) {
-    u = up;
-    l = e = 0;
-    f = fp;
-    s = 0;
-    enabled = 1;
-    selected = 0;
-  }
-
-  inline const char *exec(void) const { return e; }
-  inline const char *label(void) const { return l; }
-  inline const char **ulabel(void) const { return u; }
-  inline const int &function(void) const { return f; }
-  inline Basemenu *submenu(void) { return s; }
-
-  inline const int &isEnabled(void) const { return enabled; }
-  inline void setEnabled(int e) { enabled = e; }
-  inline const int &isSelected(void) const { return selected; }
-  inline void setSelected(int s) { selected = s; }
+        friend class Basemenu;
 };
 
 
-#endif // __Basemenu_hh
+#endif // _BASEMENU_HH_