1 files changed, 62 insertions, 36 deletions

diff --git a/src/Tab.hh b/src/Tab.hh
index c20b6ba..ebeb118 100644
--- a/src/Tab.hh
+++ b/src/Tab.hh
@@ -1,5 +1,5 @@
-// Tab.hh for Fluxbox
-// Copyright (c) 2001 Henrik Kinnunen (fluxgen@linuxmail.org)
+// Tab.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"),
@@ -19,67 +19,88 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef _TAB_HH_
-#define _TAB_HH_
+// $Id: Tab.hh,v 1.15 2002/08/11 20:57:13 fluxgen Exp $
+
+#ifndef TAB_HH
+#define TAB_HH
 
-#ifndef _IMAGE_HH_
 #include "Image.hh"
-#endif
-#ifndef _SCREEN_HH_
-#include "Screen.hh"
-#endif
-#ifndef _WINDOW_HH_
 #include "Window.hh"
-#endif
+
 
 //Note: Tab is a friend of FluxboxWindow
 
 
 class Tab {
 public:
+        enum Placement{ PTOP = 0, PBOTTOM = 5, PLEFT = 10, PRIGHT = 15, PNONE = 20};
+        enum Alignment{ ALEFT = 0, ACENTER, ARIGHT, ARELATIVE, ANONE };
+
         Tab(FluxboxWindow *win, Tab *prev=0, Tab *next=0);
         ~Tab();
-        void draw(bool pressed);
-        inline Tab *next() const { return m_next; }
-        inline Tab *prev() const { return m_prev; }
-        inline FluxboxWindow *getWindow() const { return m_win; }
-        inline unsigned int getTabWidth() const { return m_size_w; } 
-        inline unsigned int getTabHeight() const { return m_size_h; }
+
+        void setConfigured(bool value) { m_configured = value; }
+        Tab *next() { return m_next; }
+        Tab *prev() { return m_prev; }
+        Tab *last() { return getLast(this); }
+        Tab *first() { return getFirst(this); }
+        FluxboxWindow *getWindow() { return m_win; }
+
         void focus();
         void decorate();
         void deiconify();
         void iconify();
         void raise();
+        void lower();
         void withdraw();        
         void stick();
         void resize();
-        void shade();
-        //position tab to follow (FluxboxWindow *) m_win 
-        void setPosition();     
+        void shade();   
+        void setPosition();     //position tab to follow (FluxboxWindow *) m_win 
+        void moveNext();
+        void movePrev();
+        void insert(Tab *next);
+
         //event handlers
         void buttonReleaseEvent(XButtonEvent *be);
         void buttonPressEvent(XButtonEvent *be);
         void exposeEvent(XExposeEvent *ee);     
         void motionNotifyEvent(XMotionEvent *me);
-        static Tab *getFirst(Tab *current);
+        
         void disconnect();
         
-        enum { PTop = 0, PBottom = 5, PLeft = 10, PRight = 15, pnone = 20};
-        enum { ALeft = 0, ACenter, ARight, ARelative, anone };
-
-        static const char *getTabPlacementString(int placement);
-        static int getTabPlacementNum(const char *string);
-        static const char *getTabAlignmentString(int placement);
-        static int getTabAlignmentNum(const char *string);
-        //TODO: do these have to be public?
-        void resizeGroup(void); // used when (un)shading windows
-        void calcIncrease(void);
-        inline bool configured() { return m_configured; }
-        inline void setConfigured(bool value) { m_configured = value; }
+        //accessors
+        
+        static const char *getTabPlacementString(Tab::Placement placement);
+        static Tab::Placement getTabPlacementNum(const char *string);
+        static const char *getTabAlignmentString(Tab::Alignment alignment);
+        static Tab::Alignment getTabAlignmentNum(const char *string);
+        
+        const Tab *next() const { return m_next; }
+        const Tab *prev() const { return m_prev; }
+        const Tab *last() const { return getLast(const_cast<Tab *>(this)); }
+        const Tab *first() const { return getFirst(const_cast<Tab *>(this)); }
+        
+        const FluxboxWindow *getWindow() const { return m_win; }
+        Window getTabWindow() const { return m_tabwin; }
+        unsigned int getTabWidth() const { return m_size_w; } 
+        unsigned int getTabHeight() const { return m_size_h; }
+        
+        void resizeGroup(); // used when (un)shading windows
+        void calcIncrease();
+        bool configured() const { return m_configured; }
+        void draw(bool pressed) const;
+
+        bool addWindowToGroup(FluxboxWindow *window);
+
+        static Tab *getFirst(Tab *current);
+        static Tab *getLast(Tab *current);
+
 private:        
+
         bool m_configured;
         
-        void insert(Tab *next); 
+        
         //The size of the tab
         unsigned int m_size_w;
         unsigned int m_size_h;
@@ -89,8 +110,13 @@ private:
         static const int m_max_tabs; 
         bool m_focus, m_moving;  // moving and focus 
         void createTabWindow(); // creates the X win of tab
+        void loadTheme(); // loads the textures with right width and height
+        int setPositionShadingHelper(bool shaded);
+        int setPositionTBAlignHelper(Alignment align);
+        int setPositionLRAlignHelper(Alignment align);
         void setTabWidth(unsigned int w);
         void setTabHeight(unsigned int h);
+        unsigned int numObjects();
         unsigned int calcRelativeWidth();
         unsigned int calcRelativeHeight();
         unsigned int calcCenterXPos();
@@ -112,7 +138,7 @@ private:
                         return (tp==p);
                 }
                 inline bool operator == (const char *str) {
-                        if (strcasecmp(string, str)==0)
+                        if (strcasecmp(string, str) == 0)
                                 return true;
                         return false;
                 }
@@ -122,4 +148,4 @@ private:
 
 };
 
-#endif //_TAB_HH_
+#endif //TAB_HH