X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FConfigmenu.hh;h=081e397f2784eb37e028b5d21f087b3d04c9be86;hb=1e36acfd9198a7d8cbad4eef094e15a03eebc291;hp=3ff3222de11992ed96e8a4f96f609796073c6b02;hpb=da67802bc8bd42741fae491bf932ff17ee16f0f7;p=chaz%2Fopenbox

diff --git a/src/Configmenu.hh b/src/Configmenu.hh
index 3ff3222d..081e397f 100644
--- a/src/Configmenu.hh
+++ b/src/Configmenu.hh
@@ -61,6 +61,34 @@ private:
     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:
@@ -77,14 +105,35 @@ private:
   };
 #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;
+  WindowToWindowSnapmenu *windowsnapmenu;
+  WindowToEdgeSnapmenu *edgesnapmenu;
 #ifdef    XINERAMA
   Xineramamenu *xineramamenu;
 #endif // XINERAMA
+#ifdef    XFT
+  Xftmenu *xftmenu;
+#endif // XFT
 
-  friend class Focusmenu;
-  friend class Placementmenu;
+//  friend class Focusmenu;
+//  friend class Placementmenu;
 
   Configmenu(const Configmenu&);
   Configmenu& operator=(const Configmenu&);
@@ -99,9 +148,14 @@ public:
 
   inline Basemenu *getFocusmenu(void) { return focusmenu; }
   inline Basemenu *getPlacementmenu(void) { return placementmenu; }
+  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);
 };