aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/FbCommandFactory.cc16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/FbCommandFactory.cc b/src/FbCommandFactory.cc
index 50dda7e..ece39b1 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.21 2003/12/03 22:13:21 fluxgen Exp $ 23// $Id: FbCommandFactory.cc,v 1.22 2003/12/19 03:55:10 fluxgen Exp $
24 24
25#include "FbCommandFactory.hh" 25#include "FbCommandFactory.hh"
26 26
@@ -62,6 +62,7 @@ FbCommandFactory::FbCommandFactory() {
62 const char* commands[] = { 62 const char* commands[] = {
63 "arrangewindows", 63 "arrangewindows",
64 "close", 64 "close",
65 "commanddialog",
65 "detachclient", 66 "detachclient",
66 "exec", 67 "exec",
67 "execcommand", 68 "execcommand",
@@ -108,6 +109,7 @@ FbCommandFactory::FbCommandFactory() {
108 "sendtoworkspace", 109 "sendtoworkspace",
109 "setstyle", 110 "setstyle",
110 "setworkspacename", 111 "setworkspacename",
112 "setworkspacenamedialog",
111 "shade", 113 "shade",
112 "shadewindow", 114 "shadewindow",
113 "showdesktop", 115 "showdesktop",
@@ -147,6 +149,8 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
147 return new ExecuteCmd(arguments); // execute command on key screen 149 return new ExecuteCmd(arguments); // execute command on key screen
148 else if (command == "quit") 150 else if (command == "quit")
149 return new FbTk::SimpleCommand<Fluxbox>(*Fluxbox::instance(), &Fluxbox::shutdown); 151 return new FbTk::SimpleCommand<Fluxbox>(*Fluxbox::instance(), &Fluxbox::shutdown);
152 else if (command == "commanddialog") // run specified fluxbox command
153 return new CommandDialogCmd();
150 // 154 //
151 // Current focused window commands 155 // Current focused window commands
152 // 156 //
@@ -252,8 +256,14 @@ FbTk::Command *FbCommandFactory::stringToCommand(const std::string &command,
252 return new ShowRootMenuCmd(); 256 return new ShowRootMenuCmd();
253 else if (command == "workspacemenu") 257 else if (command == "workspacemenu")
254 return new ShowWorkspaceMenuCmd(); 258 return new ShowWorkspaceMenuCmd();
255 else if (command == "setworkspacename") 259 else if (command == "setworkspacename") {
256 return new SetWorkspaceNameCmd(); 260 if (arguments.empty())
261 return new SetWorkspaceNameCmd("empty");
262 else
263 return new SetWorkspaceNameCmd(arguments);
264 }
265 else if (command == "setworkspacenamedialog")
266 return new WorkspaceNameDialogCmd();
257 // 267 //
258 // special commands 268 // special commands
259 // 269 //