add a reconfigure action, also reconfigure on SIGUSR2.

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 0d5e6e6caafd88f061321dc9ac484ca5eba5cafb..b4ec216b118f64678b26dbd6c3cb32458c2767d3 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -9,6 +9,7 @@
 #include "screen.h"
 #include "action.h"
 #include "openbox.h"
+#include "grab.h"
 
 #include <glib.h>
 
@@ -40,43 +41,51 @@ void action_free(ObAction *a)
 }
 
 void setup_action_directional_focus_north(ObAction *a)
-{
-    a->data.diraction.direction = OB_DIRECTION_NORTH;
+{ 
+    a->data.interdiraction.inter.any.interactive = TRUE;
+    a->data.interdiraction.direction = OB_DIRECTION_NORTH;
 }
 
 void setup_action_directional_focus_east(ObAction *a)
 {
-    a->data.diraction.direction = OB_DIRECTION_EAST;
+    a->data.interdiraction.inter.any.interactive = TRUE;
+    a->data.interdiraction.direction = OB_DIRECTION_EAST;
 }
 
 void setup_action_directional_focus_south(ObAction *a)
 {
-    a->data.diraction.direction = OB_DIRECTION_SOUTH;
+    a->data.interdiraction.inter.any.interactive = TRUE;
+    a->data.interdiraction.direction = OB_DIRECTION_SOUTH;
 }
 
 void setup_action_directional_focus_west(ObAction *a)
 {
-    a->data.diraction.direction = OB_DIRECTION_WEST;
+    a->data.interdiraction.inter.any.interactive = TRUE;
+    a->data.interdiraction.direction = OB_DIRECTION_WEST;
 }
 
 void setup_action_directional_focus_northeast(ObAction *a)
 {
-    a->data.diraction.direction = OB_DIRECTION_NORTHEAST;
+    a->data.interdiraction.inter.any.interactive = TRUE;
+    a->data.interdiraction.direction = OB_DIRECTION_NORTHEAST;
 }
 
 void setup_action_directional_focus_southeast(ObAction *a)
 {
-    a->data.diraction.direction = OB_DIRECTION_SOUTHEAST;
+    a->data.interdiraction.inter.any.interactive = TRUE;
+    a->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST;
 }
 
 void setup_action_directional_focus_southwest(ObAction *a)
 {
-    a->data.diraction.direction = OB_DIRECTION_SOUTHWEST;
+    a->data.interdiraction.inter.any.interactive = TRUE;
+    a->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST;
 }
 
 void setup_action_directional_focus_northwest(ObAction *a)
 {
-    a->data.diraction.direction = OB_DIRECTION_NORTHWEST;
+    a->data.interdiraction.inter.any.interactive = TRUE;
+    a->data.interdiraction.direction = OB_DIRECTION_NORTHWEST;
 }
 
 void setup_action_send_to_desktop(ObAction *a)
@@ -586,6 +595,16 @@ ActionString actionstrings[] =
         action_unshow_desktop,
         NULL
     },
+    {
+        "desktoplast",
+        action_desktop_last,
+        NULL
+    },
+    {
+        "reconfigure",
+        action_reconfigure,
+        NULL
+    },
     {
         "restart",
         action_restart,
@@ -705,6 +724,9 @@ ObAction *action_from_string(char *name)
                 actionstrings[i].setup(a);
             break;
         }
+    if (!a)
+        g_warning("Invalid action '%s' requested. No such action exists.",
+                  name);
     return a;
 }
 
@@ -717,8 +739,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);
@@ -751,11 +776,6 @@ ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
                 if ((n = parse_find_node("here", node->xmlChildrenNode)))
                     act->data.activate.here = parse_bool(doc, n);
             }
-
-            if (act->data.any.interactive) {
-                if ((n = parse_find_node("interactive",node->xmlChildrenNode)))
-                    act->data.any.interactive = parse_bool(doc, n);
-            }
         }
         g_free(actname);
     }
@@ -905,39 +925,44 @@ void action_toggle_omnipresent(union ActionData *data)
 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);
+    if (c) {
+        grab_pointer(TRUE, None);
+        client_move(c, c->area.x + data->relative.delta, c->area.y);
+        grab_pointer(FALSE, None);
+    }
 }
 
 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);
+    if (c) {
+        grab_pointer(TRUE, None);
+        client_move(c, c->area.x, c->area.y + data->relative.delta);
+        grab_pointer(FALSE, None);
+    }
 }
 
 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);
+    if (c) {
+        grab_pointer(TRUE, None);
+        client_resize(c,
+                      c->area.width + data->relative.delta * c->size_inc.width,
+                      c->area.height);
+        grab_pointer(FALSE, None);
+    }
 }
 
 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);
+    if (c && !c->shaded) {
+        grab_pointer(TRUE, None);
+        client_resize(c, c->area.width, c->area.height +
+                      data->relative.delta * c->size_inc.height);
+        grab_pointer(FALSE, None);
+    }
 }
 
 void action_maximize_full(union ActionData *data)
@@ -1049,6 +1074,11 @@ void action_send_to_desktop_dir(union ActionData *data)
         screen_set_desktop(d);
 }
 
+void action_desktop_last(union ActionData *data)
+{
+    screen_set_desktop(screen_last_desktop);
+}
+
 void action_toggle_decorations(union ActionData *data)
 {
     ObClient *c = data->client.any.c;
@@ -1069,6 +1099,11 @@ void action_moveresize(union ActionData *data)
                      data->moveresize.button, data->moveresize.corner);
 }
 
+void action_reconfigure(union ActionData *data)
+{
+    ob_reconfigure();
+}
+
 void action_restart(union ActionData *data)
 {
     ob_restart_other(data->execute.path);
@@ -1089,22 +1124,17 @@ void action_showmenu(union ActionData *data)
 
 void action_cycle_windows(union ActionData *data)
 {
-    ObClient *c;
-    
-    c = focus_cycle(data->cycle.forward, data->cycle.linear,
-                    data->cycle.inter.any.interactive,
-                    data->cycle.inter.final, data->cycle.inter.cancel);
+    focus_cycle(data->cycle.forward, data->cycle.linear,
+                data->cycle.inter.any.interactive,
+                data->cycle.inter.final, data->cycle.inter.cancel);
 }
 
 void action_directional_focus(union ActionData *data)
 {
-    ObClient *nf;
-
-    if (!data->diraction.any.c)
-        return;
-    if ((nf = client_find_directional(data->diraction.any.c,
-                                      data->diraction.direction)))
-        client_activate(nf, FALSE);
+    focus_directional_cycle(data->interdiraction.direction,
+                            data->interdiraction.inter.any.interactive,
+                            data->interdiraction.inter.final,
+                            data->interdiraction.inter.cancel);
 }
 
 void action_movetoedge(union ActionData *data)
@@ -1136,8 +1166,9 @@ 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);
+    grab_pointer(TRUE, None);
+    client_move(c, x, y);
+    grab_pointer(FALSE, None);
 
 }
 
@@ -1200,7 +1231,9 @@ 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);
+    grab_pointer(TRUE, None);
+    client_move_resize(c, x, y, width, height);
+    grab_pointer(FALSE, None);
 }
 
 void action_send_to_layer(union ActionData *data)