aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2007-11-16 23:33:34 (GMT)
committermarkt <markt>2007-11-16 23:33:34 (GMT)
commit2e96a07cf74d66f204ce37daef2c9cc6a7c0b357 (patch)
treeca2f2a091fd730618e0851b9e9ba7c565d090e87
parentea7801d143b56f601716cb57fcc4287838cc23bd (diff)
downloadfluxbox_pavel-2e96a07cf74d66f204ce37daef2c9cc6a7c0b357.zip
fluxbox_pavel-2e96a07cf74d66f204ce37daef2c9cc6a7c0b357.tar.bz2
added :Focus key command
-rw-r--r--ChangeLog3
-rw-r--r--src/FbCommandFactory.cc10
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c0ad38a..95cce9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0.1: 2Changes for 1.0.1:
3*07/11/16: 3*07/11/16:
4 * Added new key command :Focus [<pattern>] that focuses a window (e.g., using
5 OnWindow or specified using a window pattern) (Mark, thanks Tomas Janousek)
6 FbCommandFactory.cc
4 * Using ToggleDecor from Deco=TAB should hide tabs (thanks Tomas Janousek) 7 * Using ToggleDecor from Deco=TAB should hide tabs (thanks Tomas Janousek)
5 Window.cc 8 Window.cc
6*07/11/12: 9*07/11/12:
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index 72de740..ce024eb 100644
--- a/src/FbCommandFactory.cc
+++ b/src/FbCommandFactory.cc
@@ -65,9 +65,10 @@ static int getint(const char *str, int defaultvalue) {
65FbCommandFactory::FbCommandFactory() { 65FbCommandFactory::FbCommandFactory() {
66 // setup commands that we can handle 66 // setup commands that we can handle
67 const char* commands[] = { 67 const char* commands[] = {
68 "addworkspace", 68 "activate",
69 "addworkspace",
69 "arrangewindows", 70 "arrangewindows",
70 "attach", 71 "attach",
71 "bindkey", 72 "bindkey",
72 "clientmenu", 73 "clientmenu",
73 "close", 74 "close",
@@ -81,6 +82,7 @@ FbCommandFactory::FbCommandFactory() {
81 "execcommand", 82 "execcommand",
82 "execute", 83 "execute",
83 "exit", 84 "exit",
85 "focus",
84 "focusup", 86 "focusup",
85 "focusdown", 87 "focusdown",
86 "focusleft", 88 "focusleft",
@@ -124,7 +126,7 @@ FbCommandFactory::FbCommandFactory() {
124 "reconfig", 126 "reconfig",
125 "reconfigure", 127 "reconfigure",
126 "reloadstyle", 128 "reloadstyle",
127 "removelastworkspace", 129 "removelastworkspace",
128 "resizeto", 130 "resizeto",
129 "resize", 131 "resize",
130 "resizehorizontal", 132 "resizehorizontal",
@@ -419,6 +421,8 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
419 return new WindowListCmd(FbTk::RefCount<WindowHelperCmd>(new CurrentWindowCmd(&FluxboxWindow::lower)), arguments); 421 return new WindowListCmd(FbTk::RefCount<WindowHelperCmd>(new CurrentWindowCmd(&FluxboxWindow::lower)), arguments);
420 else if (command == "lowerlayer") 422 else if (command == "lowerlayer")
421 return new WindowListCmd(FbTk::RefCount<WindowHelperCmd>(new CurrentWindowCmd(&FluxboxWindow::lowerLayer)), arguments); 423 return new WindowListCmd(FbTk::RefCount<WindowHelperCmd>(new CurrentWindowCmd(&FluxboxWindow::lowerLayer)), arguments);
424 else if (command == "activate" || command == "focus")
425 return new WindowListCmd(FbTk::RefCount<WindowHelperCmd>(new CurrentWindowCmd((void (FluxboxWindow::*)())&FluxboxWindow::focus)), arguments);
422 else if (command == "close") 426 else if (command == "close")
423 return new WindowListCmd(FbTk::RefCount<WindowHelperCmd>(new CurrentWindowCmd(&FluxboxWindow::close)), arguments); 427 return new WindowListCmd(FbTk::RefCount<WindowHelperCmd>(new CurrentWindowCmd(&FluxboxWindow::close)), arguments);
424 else if (command == "closeallwindows") 428 else if (command == "closeallwindows")