1 files changed, 61 insertions, 8 deletions

diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index e2fdb94..1851f2d 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -227,23 +227,75 @@ REGISTER_COMMAND_PARSER(focus, parseFocusCmd, void);
 
 class ActivateTabCmd: public WindowHelperCmd {
 public:
-    ActivateTabCmd() { }
+    explicit ActivateTabCmd() { }
 protected:
-    void real_execute();
+    void real_execute() {
+        WinClient* winclient = fbwindow().winClientOfLabelButtonWindow(
+                Fluxbox::instance()->lastEvent().xany.window);
+
+        if (winclient && winclient != &fbwindow().winClient()) {
+            fbwindow().setCurrentClient(*winclient, true);
+        }
+
+    }
+};
+
+
+REGISTER_COMMAND(activatetab, ActivateTabCmd, void);
+
+class SetXPropCmd: public WindowHelperCmd {
+public:
+    explicit SetXPropCmd(const FbTk::FbString& name, const FbTk::FbString& value) :
+        m_name(name), m_value(value) { }
+
+protected:
+    void real_execute() {
+
+        WinClient& client = fbwindow().winClient();
+        Atom prop = XInternAtom(client.display(), m_name.c_str(), False);
+
+        client.changeProperty(prop, XInternAtom(client.display(), "UTF8_STRING", False), 8,
+                PropModeReplace, (unsigned char*)m_value.c_str(), m_value.size());
+    }
+
+private:
+    FbTk::FbString m_name;
+    FbTk::FbString m_value;
 };
 
+FbTk::Command<void> *parseSetXPropCmd(const string &command, const string &args, bool trusted) {
+
+    SetXPropCmd* cmd = 0;
+
+    if (trusted) {
+
+        FbTk::FbString name = args;
+
+        FbTk::StringUtil::removeFirstWhitespace(name);
+        FbTk::StringUtil::removeTrailingWhitespace(name);
+
+        if (name.size() > 1 && name[0] != '=') {  // the smallest valid argument is 'X='
+
+            FbTk::FbString value;
 
-void ActivateTabCmd::real_execute() {
+            size_t eq = name.find('=');
+            if (eq != name.npos && eq != name.size()) {
 
-    WinClient* winclient = fbwindow().winClientOfLabelButtonWindow(
-            Fluxbox::instance()->lastEvent().xany.window);
+                value.assign(name, eq + 1, name.size());
+                name.resize(eq);
+            }
 
-    if (winclient && winclient != &fbwindow().winClient()) {
-        fbwindow().setCurrentClient(*winclient, true);
+            cmd = new SetXPropCmd(name, value);
+
+        }
     }
+
+    return cmd;
 }
 
-REGISTER_COMMAND(activatetab, ActivateTabCmd, void);
+REGISTER_COMMAND_PARSER(setxprop, parseSetXPropCmd, void);
+
+
 
 } // end anonymous namespace
 
@@ -677,6 +729,7 @@ void SetAlphaCmd::real_execute() {
             : m_unfocus);
 }
 
+
 REGISTER_COMMAND_WITH_ARGS(matches, MatchCmd, bool);
 
 bool MatchCmd::real_execute() {