X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fmoveresizeto.c;h=860bf73af33704133fa38c9adc2c1a948b8ee28d;hb=2b8b5da04b14af1639143cc332874c7e1a03a8bb;hp=3ecf41ad96974ce76e6421eca50724c66c644ebd;hpb=dd41ae98894a1bae63063996ddfa00e2b2936cdf;p=chaz%2Fopenbox

diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c
index 3ecf41ad..860bf73a 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;
@@ -20,7 +25,7 @@ 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_moveresizeto_startup()
+void action_moveresizeto_startup(void)
 {
     actions_register("MoveResizeTo",
                      setup_func,
@@ -58,7 +63,7 @@ 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)))
         parse_coord(doc, n, &o->x, &o->xopposite, &o->xcenter);
@@ -66,13 +71,29 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     if ((n = parse_find_node("y", node)))
         parse_coord(doc, n, &o->y, &o->yopposite, &o->ycenter);
 
-    if ((n = parse_find_node("width", node)))
-        o->w = parse_int(doc, n);
-    if ((n = parse_find_node("height", node)))
-        o->h = parse_int(doc, n);
+    if ((n = parse_find_node("width", node))) {
+        gchar *s = parse_string(doc, n);
+        if (g_ascii_strcasecmp(s, "current") != 0)
+            o->w = parse_int(doc, n);
+        g_free(s);
+    }
+    if ((n = parse_find_node("height", node))) {
+        gchar *s = parse_string(doc, n);
+        if (g_ascii_strcasecmp(s, "current") != 0)
+            o->h = parse_int(doc, n);
+        g_free(s);
+    }
 
-    if ((n = parse_find_node("monitor", node)))
-        o->monitor = parse_int(doc, n) - 1;
+    if ((n = parse_find_node("monitor", node))) {
+        gchar *s = parse_string(doc, n);
+        if (g_ascii_strcasecmp(s, "current") != 0) {
+            if (!g_ascii_strcasecmp(s, "all"))
+                o->monitor = ALL_MONITORS;
+            else
+                o->monitor = parse_int(doc, n) - 1;
+        }
+        g_free(s);
+    }
 
     return o;
 }
@@ -98,7 +119,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);