remove trailing whitespace

[chaz/openbox] / openbox / actions / moveresizeto.c

diff --git a/openbox/actions/moveresizeto.c b/openbox/actions/moveresizeto.c
index 4d23be45a8fd8f16b85b7a2094fdaa6bd32b6f3b..046a7b809f627382b3f312f2680423ffae00c5d1 100644 (file)
--- a/openbox/actions/moveresizeto.c
+++ b/openbox/actions/moveresizeto.c
@@ -20,15 +20,32 @@ 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_moveto_startup()
+void action_moveresizeto_startup()
 {
-    actions_register("MoveTo",
+    actions_register("MoveResizeTo",
                      setup_func,
                      free_func,
                      run_func,
                      NULL, NULL);
 }
 
+static void parse_coord(xmlDocPtr doc, 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);
+    }
+    g_free(s);
+}
+
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 {
     xmlNodePtr n;
@@ -41,35 +58,11 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     o->h = G_MININT;
     o->monitor = -1;
 
-    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);
-        }
-        g_free(s);
-    }
+    if ((n = parse_find_node("x", node)))
+        parse_coord(doc, n, &o->x, &o->xopposite, &o->xcenter);
 
-    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);
-            else
-                o->y = atoi(s);
-        }
-        g_free(s);
-    }
+    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) - 1;
@@ -137,7 +130,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);