holding control will now keep the menu open

5 files changed, 8 insertions, 7 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index 3be0d14..bb51d92 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -888,7 +888,7 @@ void Menu::buttonReleaseEvent(XButtonEvent &re) {
             if (m_active_index == w && isItemEnabled(w) &&
                 re.x > ix && re.x < (signed) (ix + menu.item_w) &&
                 re.y > iy && re.y < (signed) (iy + theme().itemHeight())) {
-                menuitems[w]->click(re.button, re.time);
+                menuitems[w]->click(re.button, re.time, re.state);
             } else {
                 int old = m_active_index;
                 m_active_index = w;
@@ -1054,7 +1054,7 @@ void Menu::keyPressEvent(XKeyEvent &event) {
             else {
                 // send fake button click
                 int button = (event.state & ShiftMask) ? 3 : 1;
-                find(m_active_index)->click(button, event.time);
+                find(m_active_index)->click(button, event.time, event.state);
                 m_need_update = true;
                 updateMenu();
             }
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index 7d309f4..1e708d3 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -30,12 +30,13 @@
 #include "App.hh"
 #include "StringUtil.hh"
 #include "Menu.hh"
+#include <X11/keysym.h>
 
 namespace FbTk {
 
-void MenuItem::click(int button, int time) {
+void MenuItem::click(int button, int time, unsigned int mods) {
     if (m_command.get() != 0) {
-        if (m_menu && m_close_on_click)
+        if (m_menu && m_close_on_click && (mods & ControlMask) == 0)
             m_menu->hide();
         // we need a local variable, since the command may destroy this object
         RefCount<Command> tmp(m_command);
diff --git a/src/FbTk/MenuItem.hh b/src/FbTk/MenuItem.hh
index 3b02f2e..b6777b7 100644
--- a/src/FbTk/MenuItem.hh
+++ b/src/FbTk/MenuItem.hh
@@ -138,7 +138,7 @@ public:
        @param button the button number
        @param time the time stamp 
     */
-    virtual void click(int button, int time);
+    virtual void click(int button, int time, unsigned int mods);
     /// must use this to show submenu to ensure consistency for object like window menu in ClientMenu (see Workspace.cc)
     virtual void showSubmenu();
     RefCount<Command> &command() { return m_command; }
diff --git a/src/FbTk/MultiButtonMenuItem.cc b/src/FbTk/MultiButtonMenuItem.cc
index b3fa1aa..591c13d 100644
--- a/src/FbTk/MultiButtonMenuItem.cc
+++ b/src/FbTk/MultiButtonMenuItem.cc
@@ -52,7 +52,7 @@ void MultiButtonMenuItem::setCommand(int button, FbTk::RefCount<FbTk::Command> &
     m_button_exe[button - 1] = cmd;
 }
 
-void MultiButtonMenuItem::click(int button, int time) {
+void MultiButtonMenuItem::click(int button, int time, unsigned int mods) {
     if (button <= 0 || button > static_cast<signed>(buttons()) || buttons() == 0)
         return;
 
diff --git a/src/FbTk/MultiButtonMenuItem.hh b/src/FbTk/MultiButtonMenuItem.hh
index 3e82d67..4bc1276 100644
--- a/src/FbTk/MultiButtonMenuItem.hh
+++ b/src/FbTk/MultiButtonMenuItem.hh
@@ -38,7 +38,7 @@ public:
     /// sets command to specified button
     void setCommand(int button, FbTk::RefCount<FbTk::Command> &cmd);
     /// executes command for the button click
-    virtual void click(int button, int time);
+    virtual void click(int button, int time, unsigned int mods);
     /// @return number of buttons this instance handles
     inline unsigned int buttons() const { return m_buttons; }