aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2004-01-16 11:41:38 (GMT)
committerfluxgen <fluxgen>2004-01-16 11:41:38 (GMT)
commitb7cd0599ae1ae7881bcd9bd33ad0fce03851533a (patch)
treeca042971ef2e8c3f01f50e322d14f95c74e9a616
parent41eae48eb48d7ec0a35f9d009e6b02ea8f4cae0e (diff)
downloadfluxbox-b7cd0599ae1ae7881bcd9bd33ad0fce03851533a.zip
fluxbox-b7cd0599ae1ae7881bcd9bd33ad0fce03851533a.tar.bz2
windowmenu command, patch fomr Junichiro Kita
-rw-r--r--src/FbCommandFactory.cc5
-rw-r--r--src/Toolbar.cc3
-rw-r--r--src/Window.cc3
3 files changed, 8 insertions, 3 deletions
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index d3ea8ce..c8d9f4b 100644
--- a/src/FbCommandFactory.cc
+++ b/src/FbCommandFactory.cc
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: FbCommandFactory.cc,v 1.24 2003/12/20 17:42:04 fluxgen Exp $ 23// $Id: FbCommandFactory.cc,v 1.25 2004/01/16 11:41:38 fluxgen Exp $
24 24
25#include "FbCommandFactory.hh" 25#include "FbCommandFactory.hh"
26 26
@@ -119,6 +119,7 @@ FbCommandFactory::FbCommandFactory() {
119 "stick", 119 "stick",
120 "stickwindow", 120 "stickwindow",
121 "toggledecor", 121 "toggledecor",
122 "windowmenu",
122 "workspace", 123 "workspace",
123 "workspacemenu", 124 "workspacemenu",
124 "" 125 ""
@@ -246,6 +247,8 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
246 return new CurrentWindowCmd(&FluxboxWindow::moveClientRight); 247 return new CurrentWindowCmd(&FluxboxWindow::moveClientRight);
247 else if (command == "detachclient") 248 else if (command == "detachclient")
248 return new CurrentWindowCmd(&FluxboxWindow::detachCurrentClient); 249 return new CurrentWindowCmd(&FluxboxWindow::detachCurrentClient);
250 else if (command == "windowmenu")
251 return new CurrentWindowCmd(&FluxboxWindow::popupMenu);
249 // 252 //
250 // Workspace commands 253 // Workspace commands
251 // 254 //
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index b267b77..7cda0b0 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.136 2004/01/13 14:41:32 rathnor Exp $ 25// $Id: Toolbar.cc,v 1.137 2004/01/16 11:41:38 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -493,6 +493,7 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
493 493
494 menu().move(x, y); 494 menu().move(x, y);
495 menu().show(); 495 menu().show();
496 menu().grabInputFocus();
496 } else 497 } else
497 menu().hide(); 498 menu().hide();
498 499
diff --git a/src/Window.cc b/src/Window.cc
index 9ba0f59..bb44b50 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.259 2003/12/31 00:36:16 fluxgen Exp $ 25// $Id: Window.cc,v 1.260 2004/01/16 11:41:38 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -1925,6 +1925,7 @@ void FluxboxWindow::showMenu(int menu_x, int menu_y) {
1925 m_windowmenu.move(menu_x, menu_y); 1925 m_windowmenu.move(menu_x, menu_y);
1926 m_windowmenu.show(); 1926 m_windowmenu.show();
1927 m_windowmenu.raise(); 1927 m_windowmenu.raise();
1928 m_windowmenu.grabInputFocus();
1928} 1929}
1929 1930
1930/** 1931/**