aboutsummaryrefslogtreecommitdiff
path: root/src/CurrentWindowCmd.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/CurrentWindowCmd.cc')
-rw-r--r--src/CurrentWindowCmd.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 42ee69c..9253058 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -56,8 +56,6 @@ FbTk::Command<void> *createCurrentWindowCmd(const std::string &command,
56 return new CurrentWindowCmd(&FluxboxWindow::lower); 56 return new CurrentWindowCmd(&FluxboxWindow::lower);
57 else if (command == "lowerlayer") 57 else if (command == "lowerlayer")
58 return new CurrentWindowCmd(&FluxboxWindow::lowerLayer); 58 return new CurrentWindowCmd(&FluxboxWindow::lowerLayer);
59 else if (command == "activate" || command == "focus")
60 return new CurrentWindowCmd((void (FluxboxWindow::*)())&FluxboxWindow::focus);
61 else if (command == "close") 59 else if (command == "close")
62 return new CurrentWindowCmd(&FluxboxWindow::close); 60 return new CurrentWindowCmd(&FluxboxWindow::close);
63 else if (command == "killwindow" || command == "kill") 61 else if (command == "killwindow" || command == "kill")
@@ -98,8 +96,6 @@ REGISTER_COMMAND_PARSER(raise, createCurrentWindowCmd, void);
98REGISTER_COMMAND_PARSER(raiselayer, createCurrentWindowCmd, void); 96REGISTER_COMMAND_PARSER(raiselayer, createCurrentWindowCmd, void);
99REGISTER_COMMAND_PARSER(lower, createCurrentWindowCmd, void); 97REGISTER_COMMAND_PARSER(lower, createCurrentWindowCmd, void);
100REGISTER_COMMAND_PARSER(lowerlayer, createCurrentWindowCmd, void); 98REGISTER_COMMAND_PARSER(lowerlayer, createCurrentWindowCmd, void);
101REGISTER_COMMAND_PARSER(activate, createCurrentWindowCmd, void);
102REGISTER_COMMAND_PARSER(focus, createCurrentWindowCmd, void);
103REGISTER_COMMAND_PARSER(close, createCurrentWindowCmd, void); 99REGISTER_COMMAND_PARSER(close, createCurrentWindowCmd, void);
104REGISTER_COMMAND_PARSER(killwindow, createCurrentWindowCmd, void); 100REGISTER_COMMAND_PARSER(killwindow, createCurrentWindowCmd, void);
105REGISTER_COMMAND_PARSER(kill, createCurrentWindowCmd, void); 101REGISTER_COMMAND_PARSER(kill, createCurrentWindowCmd, void);
@@ -252,6 +248,18 @@ void GoToTabCmd::real_execute() {
252 (*it)->focus(); 248 (*it)->focus();
253} 249}
254 250
251REGISTER_COMMAND_WITH_ARGS(activate, FocusCmd, void);
252REGISTER_COMMAND_WITH_ARGS(focus, FocusCmd, void);
253
254void FocusCmd::real_execute() {
255 Focusable *win = 0;
256 if (!m_pat.error())
257 win = fbwindow().screen().focusControl().focusedOrderWinList().find(m_pat);
258 if (!win)
259 win = &fbwindow();
260 win->focus();
261}
262
255REGISTER_COMMAND(startmoving, StartMovingCmd, void); 263REGISTER_COMMAND(startmoving, StartMovingCmd, void);
256 264
257void StartMovingCmd::real_execute() { 265void StartMovingCmd::real_execute() {