1 files changed, 159 insertions, 104 deletions

diff --git a/src/Slit.hh b/src/Slit.hh
index cce1d97..b5135d8 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -1,3 +1,6 @@
+// Slit.hh for Fluxbox
+// Copyright (c) 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // Slit.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -18,9 +21,9 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 // DEALINGS IN THE SOFTWARE.
-  
-#ifndef   _SLIT_HH_
-#define   _SLIT_HH_
+        
+#ifndef  SLIT_HH
+#define  SLIT_HH
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -30,130 +33,182 @@ class Slit;
 class Slitmenu;
 
 #include "Basemenu.hh"
-#include "LinkedList.hh"
 
+#include <list>
+#include <string>
 
 class Slitmenu : public Basemenu {
-private: 
-  class Directionmenu : public Basemenu {
-  private:
-    Slitmenu *slitmenu;
+public:
+        explicit Slitmenu(Slit &theslist);
+        virtual ~Slitmenu();
 
-  protected:
-    virtual void itemSelected(int, int);
+        inline Basemenu *getDirectionmenu() { return directionmenu; }
+        inline Basemenu *getPlacementmenu() { return placementmenu; }
+#ifdef XINERAMA
+        inline Basemenu *getHeadmenu() { return headmenu; }
+#endif // XINERAMA
 
-  public:
-    Directionmenu(Slitmenu *);
-  };
+        void reconfigure();
 
-  class Placementmenu : public Basemenu {
-  private:
-    Slitmenu *slitmenu;
+private: 
+        class Directionmenu : public Basemenu {
+        private:
+                Slitmenu *slitmenu;
 
-  protected: 
-    virtual void itemSelected(int, int);
+        protected:
+                virtual void itemSelected(int button, unsigned int index);
 
-  public:
-    Placementmenu(Slitmenu *);
-  };
+        public:
+                Directionmenu(Slitmenu *);
+        };
 
-  Directionmenu *directionmenu;
-  Placementmenu *placementmenu;
+        class Placementmenu : public Basemenu {
+        private:
+                Slitmenu *slitmenu;
 
-  Slit *slit;
+        protected: 
+                virtual void itemSelected(int button, unsigned int index);
 
-  friend class Directionmenu;
-  friend class Placementmenu;
-  friend class Slit;
+        public:
+                Placementmenu(Slitmenu *);
+        };
 
+#ifdef XINERAMA
+        class Headmenu : public Basemenu {
+        public:
+                Headmenu(Slitmenu *);
+        private:
+                Slitmenu *slitmenu;
 
-protected:
-  virtual void itemSelected(int, int);
-  virtual void internal_hide(void);
+        protected: 
+                virtual void itemSelected(int button, unsigned int index);
 
+        };
+#endif // XINERAMA
 
-public:
-  Slitmenu(Slit *);
-  virtual ~Slitmenu(void);
+        Directionmenu *directionmenu;
+        Placementmenu *placementmenu;
+#ifdef XINERAMA
+        Headmenu *headmenu;
+#endif // XINERAMA
+        Slit &slit;
+
+        friend class Directionmenu;
+        friend class Placementmenu;
+#ifdef XINERAMA
+        friend class Headmenu;
+#endif // XINERAMA
+        friend class Slit;
 
-  inline Basemenu *getDirectionmenu(void) { return directionmenu; }
-  inline Basemenu *getPlacementmenu(void) { return placementmenu; }
 
-  void reconfigure(void);
+protected:
+        virtual void itemSelected(int button, unsigned int index);
+        virtual void internal_hide();
 };
 
 
 class Slit : public TimeoutHandler {
-private:
-  class SlitClient {
-  public:
-    Window window, client_window, icon_window;
-
-    int x, y;
-    unsigned int width, height;
-  };
-
-  Bool on_top, hidden, do_auto_hide;
-  Display *display;
-
-  Fluxbox *fluxbox;
-  BScreen *screen;
-  BTimer *timer;
-
-  LinkedList<SlitClient> *clientList;
-  Slitmenu *slitmenu;
-
-  struct frame {
-    Pixmap pixmap;
-    Window window;
-
-    int x, y, x_hidden, y_hidden;
-    unsigned int width, height;
-  } frame;
-
-  friend class Slitmenu;
-  friend class Slitmenu::Directionmenu;
-  friend class Slitmenu::Placementmenu;
-
-
 public:
-  Slit(BScreen *);
-  virtual ~Slit();
-
-  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 Slitmenu *getMenu() { return slitmenu; }
-
-  inline const Window &getWindowID() const { return frame.window; }
+        explicit Slit(BScreen *screen);
+        virtual ~Slit();
+
+        inline bool isOnTop() const { return on_top; }
+        inline bool isHidden() const { return hidden; }
+        inline bool doAutoHide() const { return do_auto_hide; }
+
+        Slitmenu &menu() { return slitmenu; }
+
+        inline const Window &getWindowID() const { return frame.window; }
+
+        inline int x() const { return ((hidden) ? frame.x_hidden : frame.x); }
+        inline int y() const { return ((hidden) ? frame.y_hidden : frame.y); }
+
+        inline unsigned int width() const { return frame.width; }
+        inline unsigned int height() const { return frame.height; }
+
+        void addClient(Window clientwin);
+        void removeClient(Window clientwin, bool = true);
+        void reconfigure();
+        void reposition();
+        void shutdown();
+        void saveClientList();
+
+        /**
+                @name eventhandlers
+        */
+        //@{
+        void buttonPressEvent(XButtonEvent *bp);
+        void enterNotifyEvent(XCrossingEvent *en);
+        void leaveNotifyEvent(XCrossingEvent *ln);
+        void configureRequestEvent(XConfigureRequestEvent *cr);
+        //@}
+        
+        virtual void timeout();
+
+        /**
+                Client alignment
+        */
+        enum { VERTICAL = 1, HORIZONTAL };
+        /**
+                Screen placement
+        */
+        enum { TOPLEFT = 1, CENTERLEFT, BOTTOMLEFT, TOPCENTER, BOTTOMCENTER,
+                                 TOPRIGHT, CENTERRIGHT, BOTTOMRIGHT };
 
-  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); }
-
-  inline const unsigned int &getWidth(void) const { return frame.width; }
-  inline const unsigned int &getHeight(void) const { return frame.height; }
-
-  void addClient(Window);
-  void removeClient(SlitClient *, Bool = True);
-  void removeClient(Window, Bool = True);
-  void reconfigure(void);
-  void reposition(void);
-  void shutdown(void);
-
-  void buttonPressEvent(XButtonEvent *);
-  void enterNotifyEvent(XCrossingEvent *);
-  void leaveNotifyEvent(XCrossingEvent *);
-  void configureRequestEvent(XConfigureRequestEvent *);
-
-  virtual void timeout(void);
-
-  enum { Vertical = 1, Horizontal };
-  enum { TopLeft = 1, CenterLeft, BottomLeft, TopCenter, BottomCenter,
-         TopRight, CenterRight, BottomRight };
+private:
+        class SlitClient {
+        public:
+                SlitClient(BScreen *screen, Window client_window);      // For adding an actual window
+                SlitClient(const char *name);           // For adding a placeholder
+
+                // Now we pre-initialize a list of slit clients with names for
+                // comparison with incoming client windows.  This allows the slit
+                // to maintain a sorted order based on a saved window name list.
+                // Incoming windows not found in the list are appended.  Matching
+                // duplicates are inserted after the last found instance of the
+                // matching name.
+                std::string match_name;
+
+                Window window, client_window, icon_window;
+
+                int x, y;
+                unsigned int width, height;
+
+                void initialize(BScreen *screen = 0, Window client_window= None);
+        };
+        
+        void removeClient(SlitClient *client, bool remap, bool destroy);
+        void loadClientList();
+        
+        bool on_top, hidden, do_auto_hide;
+
+        Display *display; ///< display connection
+
+        Fluxbox *fluxbox; ///< obsolete
+        BScreen *screen;
+        BTimer timer;
+
+        typedef std::list<SlitClient *> SlitClients;
+
+        SlitClients clientList;
+        Slitmenu slitmenu;
+        std::string clientListPath;
+
+        struct frame {
+                Pixmap pixmap;
+                Window window;
+
+                int x, y, x_hidden, y_hidden;
+                unsigned int width, height;
+        } frame;
+
+        friend class Slitmenu;
+        friend class Slitmenu::Directionmenu;
+        friend class Slitmenu::Placementmenu;
+        #ifdef XINERAMA
+        friend class Slitmenu::Headmenu;
+        #endif // XINERAMA
 };
 
 
-#endif // __Slit_hh
+#endif // SLIT_HH