1 files changed, 32 insertions, 8 deletions

diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index dfb5c19..b73de01 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -36,6 +36,17 @@
 #include "FbTk/stringstream.hh"
 #include "FbTk/StringUtil.hh"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif // HAVE_CONFIG_H
+
+#ifdef HAVE_CSTDLIB
+#include <cstdlib>
+#else
+#include <stdlib.h>
+#endif
+
+
 using FbTk::Command;
 
 namespace {
@@ -52,12 +63,8 @@ FbTk::Command<void> *createCurrentWindowCmd(const std::string &command,
         return new CurrentWindowCmd(&FluxboxWindow::maximizeHorizontal);
     else if (command == "raise")
         return new CurrentWindowCmd(&FluxboxWindow::raise);
-    else if (command == "raiselayer")
-        return new CurrentWindowCmd(&FluxboxWindow::raiseLayer);
     else if (command == "lower")
         return new CurrentWindowCmd(&FluxboxWindow::lower);
-    else if (command == "lowerlayer")
-        return new CurrentWindowCmd(&FluxboxWindow::lowerLayer);
     else if (command == "close")
         return new CurrentWindowCmd(&FluxboxWindow::close);
     else if (command == "killwindow" || command == "kill")
@@ -95,9 +102,7 @@ REGISTER_COMMAND_PARSER(maximize, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(maximizevertical, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(maximizehorizontal, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(raise, createCurrentWindowCmd, void);
-REGISTER_COMMAND_PARSER(raiselayer, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(lower, createCurrentWindowCmd, void);
-REGISTER_COMMAND_PARSER(lowerlayer, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(close, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(killwindow, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(kill, createCurrentWindowCmd, void);
@@ -115,7 +120,7 @@ REGISTER_COMMAND_PARSER(movetabright, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(detachclient, createCurrentWindowCmd, void);
 REGISTER_COMMAND_PARSER(windowmenu, createCurrentWindowCmd, void);
 
-}; // end anonymous namespace
+} // end anonymous namespace
 
 void WindowHelperCmd::execute() {
     if (WindowCmd<void>::window() || FocusControl::focusedFbWindow())
@@ -207,7 +212,7 @@ FbTk::Command<void> *parseFocusCmd(const string &command, const string &args,
 REGISTER_COMMAND_PARSER(activate, parseFocusCmd, void);
 REGISTER_COMMAND_PARSER(focus, parseFocusCmd, void);
 
-}; // end anonymous namespace
+} // end anonymous namespace
 
 void SetHeadCmd::real_execute() {
     int num = m_head;
@@ -466,6 +471,25 @@ void SetLayerCmd::real_execute() {
     fbwindow().moveToLayer(m_layer);
 }
 
+FbTk::Command<void> *ChangeLayerCmd::parse(const string &command,
+        const string &args, bool trusted) {
+    int num = 2;
+    FbTk_istringstream iss(args.c_str());
+    iss >> num;
+    if (command == "raiselayer")
+        return new ChangeLayerCmd(-num);
+    else if (command == "lowerlayer")
+        return new ChangeLayerCmd(num);
+    return 0;
+}
+
+REGISTER_COMMAND_PARSER(raiselayer, ChangeLayerCmd::parse, void);
+REGISTER_COMMAND_PARSER(lowerlayer, ChangeLayerCmd::parse, void);
+
+void ChangeLayerCmd::real_execute() {
+    fbwindow().changeLayer(m_diff);
+}
+
 namespace {
 class SetTitleDialog: public TextDialog, public FbTk::Observer {
 public: