X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Faction.c;h=3b1201747cee809d338989fa1e90a0d71564e262;hb=3cdf906f5f65561272d448cfa2372ad9793f7760;hp=d24e81e6f67af0688c45b8a18b5366ed14bf347c;hpb=854da68d0f5bed8c85c101fd6895244d60183ff5;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index d24e81e6..3b120174 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -730,8 +730,11 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
     if (parse_attr_string("name", node, &actname)) {
         if ((act = action_from_string(actname))) {
             if (act->func == action_execute || act->func == action_restart) {
-                if ((n = parse_find_node("execute", node->xmlChildrenNode)))
-                    act->data.execute.path = parse_string(doc, n);
+                if ((n = parse_find_node("execute", node->xmlChildrenNode))) {
+                    gchar *s = parse_string(doc, n);
+                    act->data.execute.path = ob_expand_tilde(s);
+                    g_free(s);
+                }
             } else if (act->func == action_showmenu) {
                 if ((n = parse_find_node("menu", node->xmlChildrenNode)))
                     act->data.showmenu.name = parse_string(doc, n);
@@ -914,38 +917,31 @@ void action_move_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c)
-        client_configure(c, OB_CORNER_TOPLEFT,
-                         c->area.x + data->relative.delta, c->area.y,
-                         c->area.width, c->area.height, TRUE, TRUE);
+        client_move(c, c->area.x + data->relative.delta, c->area.y);
 }
 
 void action_move_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c)
-        client_configure(c, OB_CORNER_TOPLEFT,
-                         c->area.x, c->area.y + data->relative.delta,
-                         c->area.width, c->area.height, TRUE, TRUE);
+        client_move(c, c->area.x, c->area.y + data->relative.delta);
 }
 
 void action_resize_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c)
-        client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y,
-                         c->area.width +
-                         data->relative.delta * c->size_inc.width,
-                         c->area.height, TRUE, TRUE);
+        client_resize(c,
+                      c->area.width + data->relative.delta * c->size_inc.width,
+                      c->area.height);
 }
 
 void action_resize_relative_vert(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;
     if (c && !c->shaded)
-        client_configure(c, OB_CORNER_TOPLEFT, c->area.x, c->area.y,
-                         c->area.width, c->area.height +
-                         data->relative.delta * c->size_inc.height,
-                         TRUE, TRUE);
+        client_resize(c, c->area.width, c->area.height +
+                      data->relative.delta * c->size_inc.height);
 }
 
 void action_maximize_full(union ActionData *data)
@@ -1144,8 +1140,7 @@ void action_movetoedge(union ActionData *data)
         g_assert_not_reached();
     }
     frame_frame_gravity(c->frame, &x, &y);
-    client_configure(c, OB_CORNER_TOPLEFT,
-                     x, y, c->area.width, c->area.height, TRUE, TRUE);
+    client_move(c, x, y);
 
 }
 
@@ -1208,7 +1203,7 @@ void action_growtoedge(union ActionData *data)
     frame_frame_gravity(c->frame, &x, &y);
     width -= c->frame->size.left + c->frame->size.right;
     height -= c->frame->size.top + c->frame->size.bottom;
-    client_configure(c, OB_CORNER_TOPLEFT, x, y, width, height, TRUE, TRUE);
+    client_move(c, x, y);
 }
 
 void action_send_to_layer(union ActionData *data)