X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fmoveresizeto.c;h=d355dafdc5c30ea0535c1b239a2a62275899e364;hb=ea481338b5f16fd81a7b33e036ead39b918a51af;hp=4d23be45a8fd8f16b85b7a2094fdaa6bd32b6f3b;hpb=2a4cd4f6bd9f6b5a43ea6a825e964fb1f4dccd80;p=chaz%2Fopenbox

diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c
index 4d23be45..d355dafd 100644
--- a/openbox/actions/moveresizeto.c
+++ b/openbox/actions/moveresizeto.c
@@ -4,6 +4,11 @@
 #include "openbox/frame.h"
 #include <stdlib.h> /* for atoi */
 
+enum {
+    CURRENT_MONITOR = -1,
+    ALL_MONITORS = -2
+};
+
 typedef struct {
     gboolean xcenter;
     gboolean ycenter;
@@ -16,20 +21,34 @@ typedef struct {
     gint monitor;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
-static void     free_func(gpointer options);
+static gpointer setup_func(xmlNodePtr node);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_moveto_startup()
+void action_moveresizeto_startup(void)
+{
+    actions_register("MoveResizeTo", setup_func, g_free, run_func, NULL, NULL);
+}
+
+static void parse_coord(xmlNodePtr n, gint *pos,
+                        gboolean *opposite, gboolean *center)
 {
-    actions_register("MoveTo",
-                     setup_func,
-                     free_func,
-                     run_func,
-                     NULL, NULL);
+    gchar *s = obt_parse_node_string(n);
+    if (g_ascii_strcasecmp(s, "current") != 0) {
+        if (!g_ascii_strcasecmp(s, "center"))
+            *center = TRUE;
+        else {
+            if (s[0] == '-')
+                *opposite = TRUE;
+            if (s[0] == '-' || s[0] == '+')
+                *pos = atoi(s+1);
+            else
+                *pos = atoi(s);
+        }
+    }
+    g_free(s);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_func(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
@@ -39,56 +58,41 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     o->y = G_MININT;
     o->w = G_MININT;
     o->h = G_MININT;
-    o->monitor = -1;
+    o->monitor = CURRENT_MONITOR;
 
-    if ((n = parse_find_node("x", node))) {
-        gchar *s = parse_string(doc, n);
-        if (!g_ascii_strcasecmp(s, "center"))
-            o->xcenter = TRUE;
-        else {
-            if (s[0] == '-')
-                o->xopposite = TRUE;
-            if (s[0] == '-' || s[0] == '+')
-                o->x = atoi(s+1);
-            else
-                o->x = atoi(s);
-        }
+    if ((n = obt_parse_find_node(node, "x")))
+        parse_coord(n, &o->x, &o->xopposite, &o->xcenter);
+
+    if ((n = obt_parse_find_node(node, "y")))
+        parse_coord(n, &o->y, &o->yopposite, &o->ycenter);
+
+    if ((n = obt_parse_find_node(node, "width"))) {
+        gchar *s = obt_parse_node_string(n);
+        if (g_ascii_strcasecmp(s, "current") != 0)
+            o->w = obt_parse_node_int(n);
+        g_free(s);
+    }
+    if ((n = obt_parse_find_node(node, "height"))) {
+        gchar *s = obt_parse_node_string(n);
+        if (g_ascii_strcasecmp(s, "current") != 0)
+            o->h = obt_parse_node_int(n);
         g_free(s);
     }
 
-    if ((n = parse_find_node("y", node))) {
-        gchar *s = parse_string(doc, n);
-        if (!g_ascii_strcasecmp(s, "center"))
-            o->ycenter = TRUE;
-        else {
-            if (s[0] == '-')
-                o->yopposite = TRUE;
-            if (s[0] == '-' || s[0] == '+')
-                o->y = atoi(s+1);
+    if ((n = obt_parse_find_node(node, "monitor"))) {
+        gchar *s = obt_parse_node_string(n);
+        if (g_ascii_strcasecmp(s, "current") != 0) {
+            if (!g_ascii_strcasecmp(s, "all"))
+                o->monitor = ALL_MONITORS;
             else
-                o->y = atoi(s);
+                o->monitor = obt_parse_node_int(n) - 1;
         }
         g_free(s);
     }
 
-    if ((n = parse_find_node("width", node)))
-        o->w = parse_int(doc, n) - 1;
-    if ((n = parse_find_node("height", node)))
-        o->h = parse_int(doc, n) - 1;
-
-    if ((n = parse_find_node("monitor", node)))
-        o->monitor = parse_int(doc, n) - 1;
-
     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)
 {
@@ -103,7 +107,8 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         c = data->client;
         mon = o->monitor;
         cmon = client_monitor(c);
-        if (mon < 0) mon = cmon;
+        if (mon == CURRENT_MONITOR) mon = cmon;
+        else if (mon == ALL_MONITORS) mon = SCREEN_AREA_ALL_MONITORS;
         area = screen_area(c->desktop, mon, NULL);
         carea = screen_area(c->desktop, cmon, NULL);
 
@@ -137,7 +142,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
 
         /* get the client's size back */
         w -= c->frame->size.left + c->frame->size.right;
-        h -= c->frame->size.top + c->frame->size.bottom;        
+        h -= c->frame->size.top + c->frame->size.bottom;
 
         frame_frame_gravity(c->frame, &x, &y); /* get the client coords */
         client_try_configure(c, &x, &y, &w, &h, &lw, &lh, TRUE);