Merge branch 'backport' into work

[mikachu/openbox.git] / openbox / actions / moveresizeto.c

diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c
index 046a7b8..3ee3498 100644 (file)
--- a/openbox/actions/moveresizeto.c
+++ b/openbox/actions/moveresizeto.c
@@ -4,6 +4,13 @@
 #include "openbox/frame.h"
 #include <stdlib.h> /* for atoi */
 
+enum {
+    CURRENT_MONITOR = -1,
+    ALL_MONITORS = -2,
+    NEXT_MONITOR = -3,
+    PREV_MONITOR = -4
+};
+
 typedef struct {
     gboolean xcenter;
     gboolean ycenter;
@@ -16,37 +23,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_moveresizeto_startup()
+void action_moveresizeto_startup(void)
 {
-    actions_register("MoveResizeTo",
-                     setup_func,
-                     free_func,
-                     run_func,
-                     NULL, NULL);
+    actions_register("MoveResizeTo", setup_func, g_free, run_func, NULL, NULL);
 }
 
-static void parse_coord(xmlDocPtr doc, xmlNodePtr n, gint *pos,
+static void parse_coord(xmlNodePtr n, gint *pos,
                         gboolean *opposite, gboolean *center)
 {
-    gchar *s = parse_string(doc, n);
-    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);
+    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;
@@ -56,32 +60,45 @@ 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);
+    if ((n = obt_parse_find_node(node, "x")))
+        parse_coord(n, &o->x, &o->xopposite, &o->xcenter);
 
-    if ((n = parse_find_node("y", node)))
-        parse_coord(doc, n, &o->y, &o->yopposite, &o->ycenter);
+    if ((n = obt_parse_find_node(node, "y")))
+        parse_coord(n, &o->y, &o->yopposite, &o->ycenter);
 
-    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 = 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("monitor", node)))
-        o->monitor = parse_int(doc, n) - 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 if(!g_ascii_strcasecmp(s, "next"))
+                o->monitor = NEXT_MONITOR;
+            else if(!g_ascii_strcasecmp(s, "prev"))
+                o->monitor = PREV_MONITOR;
+            else
+                o->monitor = obt_parse_node_int(n) - 1;
+        }
+        g_free(s);
+    }
 
     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)
 {
@@ -96,7 +113,11 @@ 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;
+        else if (mon == NEXT_MONITOR) mon = (cmon + 1 > screen_num_monitors - 1) ? 0 : (cmon + 1);
+        else if (mon == PREV_MONITOR) mon = (cmon == 0) ? (screen_num_monitors - 1) : (cmon - 1);
+
         area = screen_area(c->desktop, mon, NULL);
         carea = screen_area(c->desktop, cmon, NULL);
 
@@ -119,13 +140,13 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         x = o->x;
         if (o->xcenter) x = (area->width - w) / 2;
         else if (x == G_MININT) x = c->frame->area.x - carea->x;
-        else if (o->xopposite) x = area->width - w;
+        else if (o->xopposite) x = area->width - w - x;
         x += area->x;
 
         y = o->y;
         if (o->ycenter) y = (area->height - h) / 2;
         else if (y == G_MININT) y = c->frame->area.y - carea->y;
-        else if (o->yopposite) y = area->height - h;
+        else if (o->yopposite) y = area->height - h - y;
         y += area->y;
 
         /* get the client's size back */