Added layer menus for windows, toolbar, and slit, plus associated

resources. Cleaned up some cruft from the previous layering setup.

1 files changed, 15 insertions, 4 deletions

diff --git a/src/Window.hh b/src/Window.hh
index 0f6c75b..f55b307 100644
--- a/src/Window.hh
+++ b/src/Window.hh
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.hh,v 1.49 2003/02/17 22:41:24 fluxgen Exp $
+// $Id: Window.hh,v 1.50 2003/02/18 15:11:11 rathnor Exp $
 
 #ifndef  WINDOW_HH
 #define  WINDOW_HH
@@ -34,6 +34,7 @@
 #include "FbWinFrame.hh"
 #include "EventHandler.hh"
 #include "XLayerItem.hh"
+#include "LayerMenu.hh"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -58,6 +59,7 @@ class ImageControl;
 class XLayer;
 };
 
+
 /// Creates the window frame and handles any window event for it
 class FluxboxWindow : public FbTk::TimeoutHandler, public FbTk::EventHandler {
 public:
@@ -223,11 +225,14 @@ public:
     Window getFrameWindow() const { return m_frame.window().window(); }
     Window getClientWindow() const { return client.window; }
 
+    FbTk::FbWindow &getFbWindow() { return m_frame.window(); }
+    const FbTk::FbWindow &getFbWindow() const { return m_frame.window(); }
+
     FbTk::Menu &getWindowmenu() { return m_windowmenu; }
     const FbTk::Menu &getWindowmenu() const { return m_windowmenu; }
 
-    FbTk::Menu &getLayermenu() { return m_layermenu; }
-    const FbTk::Menu &getLayermenu() const { return m_layermenu; }
+    FbTk::Menu *getLayermenu() { return m_layermenu; }
+    const FbTk::Menu *getLayermenu() const { return m_layermenu; }
         
     const std::string &getTitle() const { return client.title; }
     const std::string &getIconTitle() const { return client.icon_title; }
@@ -341,7 +346,8 @@ private:
     BaseDisplay::BlackboxAttributes blackbox_attrib;
 
     Time lastButtonPressTime;
-    FbTk::Menu m_windowmenu, m_layermenu;
+    FbTk::Menu m_windowmenu;
+    LayerMenu<FluxboxWindow> *m_layermenu;
     
     timeval lastFocusTime;
         
@@ -403,5 +409,10 @@ private:
   
 };
 
+template <>
+void LayerMenuItem<FluxboxWindow>::click(int button, int time) {
+    m_object->moveToLayer(m_layernum);
+}
+
 
 #endif // WINDOW_HH