fix menus for "extra" things, like remember, so that they will be

added back if the menu is rebuilt.

1 files changed, 178 insertions, 13 deletions

diff --git a/src/Window.cc b/src/Window.cc
index ca6ab99..bfb7dae 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.205 2003/07/19 11:55:49 rathnor Exp $
+// $Id: Window.cc,v 1.206 2003/07/20 08:12:36 rathnor Exp $
 
 #include "Window.hh"
 
@@ -41,6 +41,8 @@
 #include "Workspace.hh"
 #include "LayerMenu.hh"
 #include "FbWinFrame.hh"
+#include "WinButton.hh"
+#include "WinButtonTheme.hh"
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -234,12 +236,6 @@ FluxboxWindow::FluxboxWindow(WinClient &client, BScreen &scr, FbWinFrameTheme &t
     m_screen(scr),
     m_timer(this),
     display(0),
-    m_layermenu(new LayerMenu<FluxboxWindow>(*scr.menuTheme(), 
-                                             scr.screenNumber(),
-                                             scr.imageControl(), 
-                                             *scr.layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 
-                                             this,
-                                             false)),
     m_windowmenu(*scr.menuTheme(), scr.screenNumber(), scr.imageControl()),
     m_old_decoration(DECOR_NORMAL),
     m_client(&client),   
@@ -295,6 +291,18 @@ FluxboxWindow::~FluxboxWindow() {
         }
     }
 
+    // deal with extra menus
+    ExtraMenus::iterator mit = m_extramenus.begin();
+    ExtraMenus::iterator mit_end = m_extramenus.end();
+    for (; mit != mit_end; ++mit) {
+        // we set them to NOT internal so that they will be deleted when the
+        // menu is cleaned up. We can't delete them here because they are
+        // still in the menu
+        // (They need to be internal for most of the time so that if we 
+        // rebuild the menu, then they won't be removed.
+        mit->second->setInternalMenu(false);
+    }
+
 #ifdef DEBUG
     cerr<<__FILE__<<"("<<__LINE__<<"): ~FluxboxWindow("<<this<<")"<<endl;
 #endif // DEBUG
@@ -302,10 +310,6 @@ FluxboxWindow::~FluxboxWindow() {
 
 
 void FluxboxWindow::init() { 
-    // so parent menu don't kill us
-    m_layermenu->setInternalMenu();
-    m_layermenu->disableTitle();
-
     m_attaching_tab = 0;
 
     assert(m_client);
@@ -518,7 +522,17 @@ void FluxboxWindow::init() {
     }
 
     setState(m_current_state);
-    frame().reconfigure();
+
+    addExtraMenu("Layer...",
+                 new LayerMenu<FluxboxWindow>(*screen().menuTheme(), 
+                                              screen().screenNumber(),
+                                              screen().imageControl(), 
+                                              *screen().layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), 
+                                              this,
+                                              false));
+    // the layermenu will get deleted as an extra menu
+    // don't call setupWindow here as the addExtraMenu call should
+
     sendConfigureNotify();
     // no focus default
     setFocusFlag(false);
@@ -2169,7 +2183,7 @@ void FluxboxWindow::propertyNotifyEvent(Atom atom) {
             getWMProtocols();
             //!!TODO  check this area            
             // reset window actions
-            screen().setupWindowActions(*this);
+            setupWindow();
             
         } 
         break;
@@ -3304,3 +3318,154 @@ void FluxboxWindow::sendConfigureNotify(bool send_to_netizens) {
     } // end for        
 }
 
+void FluxboxWindow::addExtraMenu(const char *label, FbTk::Menu *menu) {
+    menu->setInternalMenu();
+    menu->disableTitle();
+    m_extramenus.push_back(std::make_pair(label, menu));
+
+    setupWindow();
+}
+
+void FluxboxWindow::removeExtraMenu(FbTk::Menu *menu) {
+    ExtraMenus::iterator it = m_extramenus.begin();
+    ExtraMenus::iterator it_end = m_extramenus.end();
+    for (; it != it_end; ++it) {
+        if (it->second == menu) {
+            m_extramenus.erase(it);
+            break;
+        }
+    }
+    setupWindow();
+}    
+
+
+void FluxboxWindow::setupWindow() {
+    // sets up our window
+    // we allow both to be done at once to share the commands
+
+    FbWinFrame &frame = *m_frame.get();
+    WinButtonTheme &winbutton_theme = screen().winButtonTheme();
+
+    typedef FbTk::RefCount<FbTk::Command> CommandRef;
+
+    using namespace FbTk;
+    typedef RefCount<Command> CommandRef;
+    typedef SimpleCommand<FluxboxWindow> WindowCmd;
+
+    CommandRef iconify_cmd(new WindowCmd(*this, &FluxboxWindow::iconify));
+    CommandRef maximize_cmd(new WindowCmd(*this, &FluxboxWindow::maximize));
+    CommandRef maximize_vert_cmd(new WindowCmd(*this, &FluxboxWindow::maximizeVertical));
+    CommandRef maximize_horiz_cmd(new WindowCmd(*this, &FluxboxWindow::maximizeHorizontal));
+    CommandRef close_cmd(new WindowCmd(*this, &FluxboxWindow::close));
+    CommandRef shade_cmd(new WindowCmd(*this, &FluxboxWindow::shade));
+    CommandRef raise_cmd(new WindowCmd(*this, &FluxboxWindow::raise));
+    CommandRef lower_cmd(new WindowCmd(*this, &FluxboxWindow::lower));
+    CommandRef raise_and_focus_cmd(new WindowCmd(*this, &FluxboxWindow::raiseAndFocus));
+    CommandRef stick_cmd(new WindowCmd(*this, &FluxboxWindow::stick));
+    CommandRef show_menu_cmd(new WindowCmd(*this, &FluxboxWindow::popupMenu));
+
+    // clear old buttons from frame
+    frame.removeAllButtons();
+    //!! TODO: fix this ugly hack
+    // get titlebar configuration
+    const vector<Fluxbox::Titlebar> *dir = &Fluxbox::instance()->getTitlebarLeft();
+    for (char c=0; c<2; c++) {
+        for (size_t i=0; i< dir->size(); ++i) {
+            //create new buttons
+            FbTk::Button *newbutton = 0;
+            if (isIconifiable() && (*dir)[i] == Fluxbox::MINIMIZE) {
+                newbutton = new WinButton(*this, winbutton_theme,
+                                          WinButton::MINIMIZE, 
+                                          frame.titlebar(), 
+                                          0, 0, 10, 10);
+                newbutton->setOnClick(iconify_cmd);
+
+            } else if (isMaximizable() && (*dir)[i] == Fluxbox::MAXIMIZE) {
+                newbutton = new WinButton(*this, winbutton_theme,
+                                          WinButton::MAXIMIZE, 
+                                          frame.titlebar(), 
+                                          0, 0, 10, 10);
+
+                newbutton->setOnClick(maximize_cmd, 1);
+                newbutton->setOnClick(maximize_horiz_cmd, 3);
+                newbutton->setOnClick(maximize_vert_cmd, 2);
+
+            } else if (isClosable() && (*dir)[i] == Fluxbox::CLOSE) {
+                newbutton = new WinButton(*this, winbutton_theme,
+                                          WinButton::CLOSE, 
+                                          frame.titlebar(), 
+                                          0, 0, 10, 10);
+
+                newbutton->setOnClick(close_cmd);
+#ifdef DEBUG
+                cerr<<__FILE__<<": Creating close button"<<endl;
+#endif // DEBUG
+            } else if ((*dir)[i] == Fluxbox::STICK) {
+                WinButton *winbtn = new WinButton(*this, winbutton_theme,
+                                                  WinButton::STICK,
+                                                  frame.titlebar(),
+                                                  0, 0, 10, 10);
+                stateSig().attach(winbtn);
+                winbtn->setOnClick(stick_cmd);
+                newbutton = winbtn;                
+            } else if ((*dir)[i] == Fluxbox::SHADE) {
+                WinButton *winbtn = new WinButton(*this, winbutton_theme,
+                                                  WinButton::SHADE,
+                                                  frame.titlebar(),
+                                                  0, 0, 10, 10);               
+                winbtn->setOnClick(shade_cmd);
+            }
+
+            if (newbutton != 0) {
+                newbutton->show();
+                if (c == 0)
+                    frame.addLeftButton(newbutton);
+                else
+                    frame.addRightButton(newbutton);
+            }
+        } //end for i
+        dir = &Fluxbox::instance()->getTitlebarRight();
+    } // end for c
+
+    frame.reconfigure();
+
+    // setup titlebar
+    frame.setOnClickTitlebar(raise_and_focus_cmd, 1, false, true); // on press with button 1
+    frame.setOnClickTitlebar(shade_cmd, 1, true); // doubleclick with button 1
+    frame.setOnClickTitlebar(show_menu_cmd, 3); // on release with button 3
+    frame.setOnClickTitlebar(lower_cmd, 2); // on release with button 2
+    frame.setDoubleClickTime(Fluxbox::instance()->getDoubleClickInterval());
+
+    // end setup frame
+
+    // setup menu
+    FbTk::Menu &menu = m_windowmenu;
+    menu.removeAll(); // clear old items
+    menu.disableTitle(); // not titlebar
+    
+    // set new menu items
+    menu.insert("Shade", shade_cmd);
+    menu.insert("Stick", stick_cmd);
+    menu.insert("Maximize", maximize_cmd);
+    menu.insert("Maximize Vertical", maximize_vert_cmd);
+    menu.insert("Maximize Horizontal", maximize_horiz_cmd);
+    menu.insert("Iconify", iconify_cmd);
+    menu.insert("Raise", raise_cmd);
+    menu.insert("Lower", lower_cmd);
+    CommandRef next_client_cmd(new WindowCmd(*this, &FluxboxWindow::nextClient));
+    CommandRef prev_client_cmd(new WindowCmd(*this, &FluxboxWindow::prevClient));
+    menu.insert("Next Client", next_client_cmd);
+    menu.insert("Prev Client", prev_client_cmd);
+
+    ExtraMenus::iterator it = m_extramenus.begin();
+    ExtraMenus::iterator it_end = m_extramenus.end();
+    for (; it != it_end; ++it) {
+        it->second->disableTitle(); // be sure there is no title
+        menu.insert(it->first, it->second);
+    }
+
+    menu.insert("ŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻŻ");
+    menu.insert("Close", close_cmd);
+
+    menu.reconfigure(); // update graphics
+}