add moverelative action

4 files changed, 70 insertions, 2 deletions

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index e6f5ab06..cbd9f137 100644
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -22,4 +22,5 @@ void action_all_startup()
     action_fullscreen_startup();
     action_maximize_startup();
     action_moveto_startup();
+    action_moverelative_startup();
 }
diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index 846ec6c4..f026106e 100644
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -23,5 +23,6 @@ void action_iconify_startup();
 void action_fullscreen_startup();
 void action_maximize_startup();
 void action_moveto_startup();
+void action_moverelative_startup();
 
 #endif
diff --git a/openbox/actions/moverelative.c b/openbox/actions/moverelative.c
new file mode 100644
index 00000000..f3a30648
--- /dev/null
+++ b/openbox/actions/moverelative.c
@@ -0,0 +1,68 @@
+#include "openbox/actions.h"
+#include "openbox/client.h"
+#include "openbox/screen.h"
+#include "openbox/frame.h"
+#include <stdlib.h> /* for atoi */
+
+typedef struct {
+    gint x;
+    gint y;
+} Options;
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static void     free_func(gpointer options);
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+void action_moverelative_startup()
+{
+    actions_register("MoveRelative",
+                     setup_func,
+                     free_func,
+                     run_func,
+                     NULL, NULL);
+}
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o;
+
+    o = g_new0(Options, 1);
+
+    if ((n = parse_find_node("x", node)))
+        o->x = parse_int(doc, n);
+    if ((n = parse_find_node("y", node)))
+        o->y = parse_int(doc, n);
+
+    return o;
+}
+
+static void free_func(gpointer options)
+{
+    Options *o = options;
+
+    g_free(o);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    Options *o = options;
+
+    if (data->client) {
+        ObClient *c;
+        gint x, y, lw, lh, w, h;
+
+        c = data->client;
+        x = data->client->area.x + o->x;
+        y = data->client->area.y + o->y;
+        w = data->client->area.width;
+        h = data->client->area.height;
+        client_try_configure(data->client, &x, &y, &w, &h, &lw, &lh, TRUE);
+        client_find_onscreen(data->client, &x, &y, w, h, FALSE);
+
+        client_configure(data->client, x, y, w, h, TRUE, TRUE, FALSE);
+    }
+
+    return FALSE;
+}
diff --git a/openbox/actions/moveto.c b/openbox/actions/moveto.c
index 7cc6541d..a8ba4261 100644
--- a/openbox/actions/moveto.c
+++ b/openbox/actions/moveto.c
@@ -99,9 +99,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         /* force it on screen if its moving to another monitor */
         client_find_onscreen(c, &x, &y, w, h, mon != cmon);
 
-        actions_client_move(data, TRUE);
         client_configure(c, x, y, w, h, TRUE, TRUE, FALSE);
-        actions_client_move(data, FALSE);
 
         g_free(area);
         g_free(carea);