for MoveResizeTo make <width>current</width> and <height>current</height> and <monito...

diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c
index 3ecf41ad96974ce76e6421eca50724c66c644ebd..48b6e3bf2b369625f75f60c3779902da0cbdc7c6 100644 (file)
--- a/openbox/actions/moveresizeto.c
+++ b/openbox/actions/moveresizeto.c
@@ -66,13 +66,25 @@ 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)
+            o->monitor = parse_int(doc, n) - 1;
+        g_free(s);
+    }
 
     return o;
 }