add SetLayer key command

4 files changed, 27 insertions, 19 deletions

diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index 4c027d9..42ee69c 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -23,6 +23,7 @@
 #include "CurrentWindowCmd.hh"
 
 #include "fluxbox.hh"
+#include "Layer.hh"
 #include "Window.hh"
 #include "WindowCmd.hh"
 #include "Screen.hh"
@@ -479,6 +480,18 @@ void FullscreenCmd::real_execute() {
     fbwindow().setFullscreen(!fbwindow().isFullscreen());
 }
 
+FbTk::Command<void> *SetLayerCmd::parse(const string &command,
+                                        const string &args, bool trusted) {
+    int l = Layer::getNumFromString(args);
+    return (l == -1) ? 0 : new SetLayerCmd(l);
+}
+
+REGISTER_COMMAND_PARSER(setlayer, SetLayerCmd::parse, void);
+
+void SetLayerCmd::real_execute() {
+    fbwindow().moveToLayer(m_layer);
+}
+
 FbTk::Command<void> *SetAlphaCmd::parse(const string &command, const string &args,
                                   bool trusted) {
     typedef std::vector<string> StringTokens;
diff --git a/src/CurrentWindowCmd.hh b/src/CurrentWindowCmd.hh
index 157855c..5d381a2 100644
--- a/src/CurrentWindowCmd.hh
+++ b/src/CurrentWindowCmd.hh
@@ -247,6 +247,17 @@ private:
     int m_relative, m_un_relative;
 };
 
+class SetLayerCmd: public WindowHelperCmd {
+public:
+    explicit SetLayerCmd(int layer): m_layer(layer) { }
+    static FbTk::Command<void> *parse(const std::string &command,
+                                      const std::string &args, bool trusted);
+protected:
+    void real_execute();
+private:
+    int m_layer;
+};
+
 class MatchCmd: public WindowHelperBoolCmd {
 public:
     MatchCmd(const std::string &pat): m_pat(pat.c_str()) { };
diff --git a/src/Layer.hh b/src/Layer.hh
index 58fb5b6..da8f04c 100644
--- a/src/Layer.hh
+++ b/src/Layer.hh
@@ -54,7 +54,7 @@ public:
 
     explicit Layer(int i) : m_num(i) {};
 
-    static int getNumFromString(string &str) {
+    static int getNumFromString(const string &str) {
         int tempnum = 0;
         if (sscanf(str.c_str(), "%d", &tempnum) == 1)
             return tempnum;
diff --git a/src/Remember.cc b/src/Remember.cc
index ff0094c..f76fe9b 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -411,24 +411,8 @@ int Remember::parseApp(ifstream &file, Application &app, string *first_line) {
                 else
                     had_error = true;
             } else if (strcasecmp(str_key.c_str(), "Layer") == 0) {
-                unsigned int l;
-                if (strcasecmp(str_label.c_str(), "DESKTOP") == 0) {
-                    l = Layer::DESKTOP;
-                } else if (strcasecmp(str_label.c_str(), "BOTTOM") == 0) {
-                    l = Layer::BOTTOM;
-                } else if (strcasecmp(str_label.c_str(), "NORMAL") == 0) {
-                    l = Layer::NORMAL;
-                } else if (strcasecmp(str_label.c_str(), "TOP") == 0) {
-                    l = Layer::TOP;
-                } else if (strcasecmp(str_label.c_str(), "DOCK") == 0) {
-                    l = Layer::DOCK;
-                } else if (strcasecmp(str_label.c_str(), "ABOVEDOCK") == 0) {
-                    l = Layer::ABOVE_DOCK;
-                } else if (strcasecmp(str_label.c_str(), "MENU") == 0) {
-                    l = Layer::MENU;
-                } else if (!getuint(str_label.c_str(), l)) {
-                    had_error = true;
-                }
+                int l = Layer::getNumFromString(str_label);
+                had_error = (l == -1);
                 if (!had_error)
                     app.rememberLayer(l);
             } else if (strcasecmp(str_key.c_str(), "Dimensions") == 0) {