merged with 2_1-merged-to-HEAD-2002-09-30

[chaz/openbox] / src / Configmenu.hh

diff --git a/src/Configmenu.hh b/src/Configmenu.hh
index 101b021b9a46e77ccfbd18f11f7f65179e880c69..081e397f2784eb37e028b5d21f087b3d04c9be86 100644 (file)
--- a/src/Configmenu.hh
+++ b/src/Configmenu.hh
@@ -40,9 +40,11 @@ private:
 
   protected:
     virtual void itemSelected(int button, unsigned int index);
+    virtual void setValues(void);
 
   public:
     Focusmenu(Configmenu *cm);
+    virtual void reconfigure(void);
   };
 
   class Placementmenu : public Basemenu {
@@ -52,22 +54,93 @@ private:
 
   protected:
     virtual void itemSelected(int button, unsigned int index);
+    virtual void setValues(void);
 
   public:
     Placementmenu(Configmenu *cm);
+    virtual void reconfigure(void);
   };
 
+  class WindowToWindowSnapmenu : public Basemenu {
+  private:
+    WindowToWindowSnapmenu(const WindowToWindowSnapmenu&);
+    WindowToWindowSnapmenu& operator=(const WindowToWindowSnapmenu&);
+
+  protected:
+    virtual void itemSelected(int button, unsigned int index);
+    virtual void setValues(void);
+
+  public:
+    WindowToWindowSnapmenu(Configmenu *cm);
+    virtual void reconfigure(void);
+  };
+
+  class WindowToEdgeSnapmenu : public Basemenu {
+  private:
+    WindowToEdgeSnapmenu(const WindowToEdgeSnapmenu&);
+    WindowToEdgeSnapmenu& operator=(const WindowToEdgeSnapmenu&);
+
+  protected:
+    virtual void itemSelected(int button, unsigned int index);
+    virtual void setValues(void);
+
+  public:
+    WindowToEdgeSnapmenu(Configmenu *cm);
+    virtual void reconfigure(void);
+  };
+
+#ifdef    XINERAMA
+  class Xineramamenu : public Basemenu {
+  private:
+    Xineramamenu(const Xineramamenu&);
+    Xineramamenu& operator=(const Xineramamenu&);
+
+  protected:
+    virtual void itemSelected(int button, unsigned int index);
+    virtual void setValues(void);
+
+  public:
+    Xineramamenu(Configmenu *cm);
+    virtual void reconfigure(void);
+  };
+#endif // XINERAMA
+
+#ifdef    XFT
+  class Xftmenu : public Basemenu {
+  private:
+    Xftmenu(const Xftmenu&);
+    Xftmenu& operator=(const Xftmenu&);
+
+  protected:
+    virtual void itemSelected(int button, unsigned int index);
+    virtual void setValues(void);
+
+  public:
+    Xftmenu(Configmenu *cm);
+    virtual void reconfigure(void);
+  };
+#endif // XFT
+
   Focusmenu *focusmenu;
   Placementmenu *placementmenu;
-
-  friend class Focusmenu;
-  friend class Placementmenu;
+  WindowToWindowSnapmenu *windowsnapmenu;
+  WindowToEdgeSnapmenu *edgesnapmenu;
+#ifdef    XINERAMA
+  Xineramamenu *xineramamenu;
+#endif // XINERAMA
+#ifdef    XFT
+  Xftmenu *xftmenu;
+#endif // XFT
+
+//  friend class Focusmenu;
+//  friend class Placementmenu;
 
   Configmenu(const Configmenu&);
   Configmenu& operator=(const Configmenu&);
 
 protected:
   virtual void itemSelected(int button, unsigned int index);
+  virtual void setValues(void);
 
 public:
   Configmenu(BScreen *scr);
@@ -75,8 +148,16 @@ public:
 
   inline Basemenu *getFocusmenu(void) { return focusmenu; }
   inline Basemenu *getPlacementmenu(void) { return placementmenu; }
-
-  void reconfigure(void);
+  inline Basemenu *getWindowSnapmenu(void) { return windowsnapmenu; }
+  inline Basemenu *getEdgeSnapmenu(void) { return edgesnapmenu; }
+#ifdef    XINERAMA
+  inline Basemenu *getXineramamenu(void) { return xineramamenu; }
+#endif // XINERAMA
+#ifdef    XFT
+  inline Basemenu *getXftmenu(void) { return xftmenu; }
+#endif // XFT
+
+  virtual void reconfigure(void);
 };
 
 #endif // __Configmenu_hh