add moverelative action

diff --git a/Makefile.am b/Makefile.am
index 1b94d4ff285fffc1dc183a9cf9b8ddce4aaac093..82cdfed3357d73659eb43c6c63230e7e2ac12617 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -168,6 +168,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/lower.c \
        openbox/actions/maximize.c \
        openbox/actions/move.c \
+       openbox/actions/moverelative.c \
        openbox/actions/moveto.c \
        openbox/actions/raise.c \
        openbox/actions/raiselower.c \

diff --git a/openbox/action.c b/openbox/action.c
index 61f346b1cad329aeedd75ce248f92890c1827a6a..dca4ede4b62646416abeb6a5d43f4c91b3b22765 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -494,26 +494,11 @@ ActionString actionstrings[] =
         action_move_relative_horz,
         setup_client_action
     },
-    {
-        "moverelativevert",
-        action_move_relative_vert,
-        setup_client_action
-    },
-    {
-        "resizerelativehorz",
-        action_resize_relative_horz,
-        setup_client_action
-    },
     {
         "resizerelativevert",
         action_resize_relative_vert,
         setup_client_action
     },
-    {
-        "moverelative",
-        action_move_relative,
-        setup_client_action
-    },
     {
         "resizerelative",
         action_resize_relative,
@@ -762,17 +747,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
 
     if (parse_attr_string("name", node, &actname)) {
         if ((act = action_from_string(actname, uact))) {
-            } else if (act->func == action_move_relative_horz ||
-                       act->func == action_move_relative_vert ||
-                       act->func == action_resize_relative_horz ||
-                       act->func == action_resize_relative_vert) {
-                if ((n = parse_find_node("delta", node->xmlChildrenNode)))
-                    act->data.relative.deltax = parse_int(doc, n);
-            } else if (act->func == action_move_relative) {
-                if ((n = parse_find_node("x", node->xmlChildrenNode)))
-                    act->data.relative.deltax = parse_int(doc, n);
-                if ((n = parse_find_node("y", node->xmlChildrenNode)))
-                    act->data.relative.deltay = parse_int(doc, n);
             } else if (act->func == action_resize_relative) {
                 if ((n = parse_find_node("left", node->xmlChildrenNode)))
                     act->data.relative.deltaxl = parse_int(doc, n);
@@ -1004,22 +978,6 @@ void action_toggle_omnipresent(union ActionData *data)
                        screen_desktop : DESKTOP_ALL, FALSE, TRUE);
 }
 
-void action_move_relative_horz(union ActionData *data)
-{
-    ObClient *c = data->relative.any.c;
-    client_action_start(data);
-    client_move(c, c->area.x + data->relative.deltax, c->area.y);
-    client_action_end(data, FALSE);
-}
-
-void action_move_relative_vert(union ActionData *data)
-{
-    ObClient *c = data->relative.any.c;
-    client_action_start(data);
-    client_move(c, c->area.x, c->area.y + data->relative.deltax);
-    client_action_end(data, FALSE);
-}
-
 void action_resize_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index e6f5ab06ab81d3fa01991cc664b6080119de0bae..cbd9f137c99ffe2a5ec24e68cfbb16f42bb606d4 100644 (file)
--- 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 846ec6c4940f330f2273e89476a042453f1aa6e5..f026106eec93cca3fb18205b8c7ada4b94b68e51 100644 (file)
--- 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 (file)
index 0000000..f3a3064
--- /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 7cc6541dbfa481236bf0673dfd7c9ab3645d43c9..a8ba4261b0a34c7969fbd25d8ac96c5c0ed32aa4 100644 (file)
--- 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);