1 files changed, 121 insertions, 127 deletions

diff --git a/src/Slit.hh b/src/Slit.hh
index cce1d97..10b141a 100644
--- a/src/Slit.hh
+++ b/src/Slit.hh
@@ -1,5 +1,8 @@
+// Slit.hh for Fluxbox
+// Copyright (c) 2002 - 2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
+//
 // Slit.hh for Blackbox - an X11 Window manager
-// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
+// Copyright (c) 1997 - 2000 Brad Hughes (bhughes at tcac.net)
 //
 // Permission is hereby granted, free of charge, to any person obtaining a
 // copy of this software and associated documentation files (the "Software"),
@@ -18,142 +21,133 @@
 // 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_
-
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-// forward declaration
-class Slit;
-class Slitmenu;
-
-#include "Basemenu.hh"
-#include "LinkedList.hh"
-
-
-class Slitmenu : public Basemenu {
-private: 
-  class Directionmenu : public Basemenu {
-  private:
-    Slitmenu *slitmenu;
-
-  protected:
-    virtual void itemSelected(int, int);
-
-  public:
-    Directionmenu(Slitmenu *);
-  };
+        
+/// $Id: Slit.hh,v 1.30 2003/05/17 11:00:50 fluxgen Exp $
 
-  class Placementmenu : public Basemenu {
-  private:
-    Slitmenu *slitmenu;
+#ifndef  SLIT_HH
+#define  SLIT_HH
 
-  protected: 
-    virtual void itemSelected(int, int);
-
-  public:
-    Placementmenu(Slitmenu *);
-  };
-
-  Directionmenu *directionmenu;
-  Placementmenu *placementmenu;
-
-  Slit *slit;
-
-  friend class Directionmenu;
-  friend class Placementmenu;
-  friend class Slit;
+#include "Menu.hh"
+#include "FbWindow.hh"
+#include "Timer.hh"
+#include "XLayerItem.hh"
+#include "LayerMenu.hh"
 
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
 
-protected:
-  virtual void itemSelected(int, int);
-  virtual void internal_hide(void);
+#include <list>
+#include <string>
+#include <memory>
 
+class SlitTheme;
+class SlitClient;
+class BScreen;
+class FbMenu;
 
+/// Handles dock apps
+class Slit : public FbTk::TimeoutHandler, public FbTk::EventHandler {
 public:
-  Slitmenu(Slit *);
-  virtual ~Slitmenu(void);
-
-  inline Basemenu *getDirectionmenu(void) { return directionmenu; }
-  inline Basemenu *getPlacementmenu(void) { return placementmenu; }
-
-  void reconfigure(void);
-};
+    
+    /**
+       Client alignment
+    */
+    enum Direction { VERTICAL = 1, HORIZONTAL };
+    /**
+       Placement on screen
+    */
+    enum Placement { TOPLEFT = 1, CENTERLEFT, BOTTOMLEFT, TOPCENTER, BOTTOMCENTER,
+           TOPRIGHT, CENTERRIGHT, BOTTOMRIGHT };
+    Slit(BScreen &screen, FbTk::XLayer &layer, const char *filename = 0);
+    virtual ~Slit();
+
+    inline bool isHidden() const { return m_hidden; }
+    inline bool doAutoHide() const { return m_do_auto_hide; }
+    inline Direction direction() const { return m_direction; }
+    inline Placement placement() const { return m_placement; }
+    FbTk::Menu &menu() { return m_slitmenu; }
+
+    inline const FbTk::FbWindow &window() const { return frame.window; }
+
+    inline int x() const { return (m_hidden ? frame.x_hidden : frame.x); }
+    inline int y() const { return (m_hidden ? frame.y_hidden : frame.y); }
+
+    inline unsigned int width() const { return frame.width; }
+    inline unsigned int height() const { return frame.height; }
+
+    void setDirection(Direction dir);
+    void setPlacement(Placement place);
+    void setAutoHide(bool val);
+    void addClient(Window clientwin);
+    void removeClient(Window clientwin, bool remap = true);
+    void reconfigure();
+    void reposition();
+    void shutdown();
+    /// save clients name in a file
+    void saveClientList();
+    /// cycle slit clients up one step
+    void cycleClientsUp();
+    /// cycle slit clients down one step
+    void cycleClientsDown();
+
+    BScreen &screen() { return m_screen; }
+    const BScreen &screen() const { return m_screen; }
+    /**
+       @name eventhandlers
+    */
+    //@{
+    void handleEvent(XEvent &event);
+    void buttonPressEvent(XButtonEvent &event);
+    void enterNotifyEvent(XCrossingEvent &event);
+    void leaveNotifyEvent(XCrossingEvent &event);
+    void configureRequestEvent(XConfigureRequestEvent &event);
+    void exposeEvent(XExposeEvent &event);
+    //@}
+        
+    void moveToLayer(int layernum);
+    FbTk::XLayerItem &layerItem() { return *m_layeritem; }
+
+    virtual void timeout();
 
 
-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; }
-
-  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 };
+    void clearWindow();
+    void setupMenu();
+        
+    void removeClient(SlitClient *client, bool remap, bool destroy);
+    void loadClientList(const char *filename);
+    void updateClientmenu();
+
+    bool m_hidden, m_do_auto_hide;
+    Direction m_direction;
+    Placement m_placement;
+
+    BScreen &m_screen;
+    FbTk::Timer m_timer;
+
+    typedef std::list<SlitClient *> SlitClients;
+
+    SlitClients m_client_list;
+    FbMenu m_slitmenu, m_placement_menu, m_clientlist_menu;
+    std::auto_ptr<LayerMenu<Slit> > m_layermenu;
+    std::string m_filename;
+
+    struct frame {
+        Pixmap pixmap;
+        FbTk::FbWindow window;
+
+        int x, y, x_hidden, y_hidden;
+        unsigned int width, height;
+    } frame;
+
+    // for KDE
+    Atom m_kwm1_dockwindow, m_kwm2_dockwindow;
+
+    std::auto_ptr<FbTk::XLayerItem> m_layeritem;
+    std::auto_ptr<SlitTheme> m_slit_theme;
+    std::auto_ptr<FbTk::Transparent> m_transp;
+    static unsigned int s_eventmask;
 };
 
 
-#endif // __Slit_hh
+#endif // SLIT_HH