nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

windowmenu command, patch fomr Junichiro Kita

Browse source
This commit is contained in:
fluxgen 2004-01-16 11:41:38 +00:00
parent 41eae48eb4
commit b7cd0599ae
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/FbCommandFactory.cc
View file

@ -20,7 +20,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: FbCommandFactory.cc,v 1.24 2003/12/20 17:42:04 fluxgen Exp $ // $Id: FbCommandFactory.cc,v 1.25 2004/01/16 11:41:38 fluxgen Exp $
#include "FbCommandFactory.hh" #include "FbCommandFactory.hh"
@ -119,6 +119,7 @@ FbCommandFactory::FbCommandFactory() {
"stick", "stick",
"stickwindow", "stickwindow",
"toggledecor", "toggledecor",
"windowmenu",
"workspace", "workspace",
"workspacemenu", "workspacemenu",
"" ""
@ -246,6 +247,8 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
return new CurrentWindowCmd(&FluxboxWindow::moveClientRight); return new CurrentWindowCmd(&FluxboxWindow::moveClientRight);
else if (command == "detachclient") else if (command == "detachclient")
return new CurrentWindowCmd(&FluxboxWindow::detachCurrentClient); return new CurrentWindowCmd(&FluxboxWindow::detachCurrentClient);
else if (command == "windowmenu")
return new CurrentWindowCmd(&FluxboxWindow::popupMenu);
// //
// Workspace commands // Workspace commands
// //

3
src/Toolbar.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Toolbar.cc,v 1.136 2004/01/13 14:41:32 rathnor Exp $ // $Id: Toolbar.cc,v 1.137 2004/01/16 11:41:38 fluxgen Exp $
#include "Toolbar.hh" #include "Toolbar.hh"
@ -493,6 +493,7 @@ void Toolbar::buttonPressEvent(XButtonEvent &be) {
menu().move(x, y); menu().move(x, y);
menu().show(); menu().show();
menu().grabInputFocus();
} else } else
menu().hide(); menu().hide();

3
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.259 2003/12/31 00:36:16 fluxgen Exp $ // $Id: Window.cc,v 1.260 2004/01/16 11:41:38 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -1925,6 +1925,7 @@ void FluxboxWindow::showMenu(int menu_x, int menu_y) {
m_windowmenu.move(menu_x, menu_y); m_windowmenu.move(menu_x, menu_y);
m_windowmenu.show(); m_windowmenu.show();
m_windowmenu.raise(); m_windowmenu.raise();
m_windowmenu.grabInputFocus();
} }
/** /**