X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=f0c703ffd152a05f28c2a0c12ad83e55d34c2082;hb=92bea590c0eff5f56f70093dfa1edef2f65b113f;hp=3e463d668732643037b45ff89aa131e3ecd4e4a5;hpb=9b514b3b6165c80cfe7152c2088a97765f6c82f4;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 3e463d66..f0c703ff 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -4,12 +4,13 @@
 #include "screen.h"
 #include "action.h"
 #include "dispatch.h"
+#include "openbox.h"
 
 #include <glib.h>
 
 Action *action_new(void (*func)(union ActionData *data))
 {
-    Action *a = g_new(Action, 1);
+    Action *a = g_new0(Action, 1);
     a->func = func;
 
     /* deal with pointers */
@@ -21,165 +22,335 @@ Action *action_new(void (*func)(union ActionData *data))
 
 void action_free(Action *a)
 {
+    if (a == NULL) return;
+
     /* deal with pointers */
-    if (a->func == action_execute)
+    if (a->func == action_execute || a->func == action_restart)
         g_free(a->data.execute.path);
 
     g_free(a);
 }
 
+Action *action_from_string(char *name)
+{
+    Action *a = NULL;
+    if (!g_ascii_strcasecmp(name, "execute")) {
+        a = action_new(action_execute);
+    } else if (!g_ascii_strcasecmp(name, "focus")) {
+        a = action_new(action_focus);
+    } else if (!g_ascii_strcasecmp(name, "unfocus")) {
+        a = action_new(action_unfocus);
+    } else if (!g_ascii_strcasecmp(name, "iconify")) {
+        a = action_new(action_iconify);
+    } else if (!g_ascii_strcasecmp(name, "raise")) {
+        a = action_new(action_raise);
+    } else if (!g_ascii_strcasecmp(name, "lower")) {
+        a = action_new(action_lower);
+    } else if (!g_ascii_strcasecmp(name, "focusraise")) {
+        a = action_new(action_focusraise);
+    } else if (!g_ascii_strcasecmp(name, "close")) {
+        a = action_new(action_close);
+    } else if (!g_ascii_strcasecmp(name, "kill")) {
+        a = action_new(action_kill);
+    } else if (!g_ascii_strcasecmp(name, "shade")) {
+        a = action_new(action_shade);
+    } else if (!g_ascii_strcasecmp(name, "unshade")) {
+        a = action_new(action_unshade);
+    } else if (!g_ascii_strcasecmp(name, "toggleshade")) {
+        a = action_new(action_toggle_shade);
+    } else if (!g_ascii_strcasecmp(name, "toggleomnipresent")) {
+        a = action_new(action_toggle_omnipresent);
+    } else if (!g_ascii_strcasecmp(name, "moverelativehorz")) {
+        a = action_new(action_move_relative_horz);
+    } else if (!g_ascii_strcasecmp(name, "moverelativevert")) {
+        a = action_new(action_move_relative_vert);
+    } else if (!g_ascii_strcasecmp(name, "resizerelativehorz")) {
+        a = action_new(action_resize_relative_horz);
+    } else if (!g_ascii_strcasecmp(name, "resizerelativevert")) {
+        a = action_new(action_resize_relative_vert);
+    } else if (!g_ascii_strcasecmp(name, "maximizefull")) {
+        a = action_new(action_maximize_full);
+    } else if (!g_ascii_strcasecmp(name, "unmaximizefull")) {
+        a = action_new(action_unmaximize_full);
+    } else if (!g_ascii_strcasecmp(name, "togglemaximizefull")) {
+        a = action_new(action_toggle_maximize_full);
+    } else if (!g_ascii_strcasecmp(name, "maximizehorz")) {
+        a = action_new(action_maximize_horz);
+    } else if (!g_ascii_strcasecmp(name, "unmaximizehorz")) {
+        a = action_new(action_unmaximize_horz);
+    } else if (!g_ascii_strcasecmp(name, "togglemaximizehorz")) {
+        a = action_new(action_toggle_maximize_horz);
+    } else if (!g_ascii_strcasecmp(name, "maximizevert")) {
+        a = action_new(action_maximize_vert);
+    } else if (!g_ascii_strcasecmp(name, "unmaximizevert")) {
+        a = action_new(action_unmaximize_vert);
+    } else if (!g_ascii_strcasecmp(name, "togglemaximizevert")) {
+        a = action_new(action_toggle_maximize_vert);
+    } else if (!g_ascii_strcasecmp(name, "sendtonextdesktop")) {
+        a = action_new(action_send_to_next_desktop);
+        a->data.sendtonextprev.wrap = FALSE;
+        a->data.sendtonextprev.follow = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "sendtonextdesktopwrap")) {
+        a = action_new(action_send_to_next_desktop);
+        a->data.sendtonextprev.wrap = TRUE;
+        a->data.sendtonextprev.follow = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "sendtopreviousdesktop")) {
+        a = action_new(action_send_to_previous_desktop);
+        a->data.sendtonextprev.wrap = FALSE;
+        a->data.sendtonextprev.follow = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "sendtopreviousdesktopwrap")) {
+        a = action_new(action_send_to_previous_desktop);
+        a->data.sendtonextprev.wrap = TRUE;
+        a->data.sendtonextprev.follow = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "desktop")) {
+        a = action_new(action_desktop);
+    } else if (!g_ascii_strcasecmp(name, "nextdesktop")) {
+        a = action_new(action_next_desktop);
+        a->data.nextprevdesktop.wrap = FALSE;
+    } else if (!g_ascii_strcasecmp(name, "nextdesktopwrap")) {
+        a = action_new(action_next_desktop);
+        a->data.nextprevdesktop.wrap = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "previousdesktop")) {
+        a = action_new(action_previous_desktop);
+        a->data.nextprevdesktop.wrap = FALSE;
+    } else if (!g_ascii_strcasecmp(name, "previousdesktopwrap")) {
+        a = action_new(action_previous_desktop);
+        a->data.nextprevdesktop.wrap = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "nextdesktopcolumn")) {
+        a = action_new(action_next_desktop_column);
+        a->data.nextprevdesktop.wrap = FALSE;
+    } else if (!g_ascii_strcasecmp(name, "nextdesktopcolumnwrap")) {
+        a = action_new(action_next_desktop_column);
+        a->data.nextprevdesktop.wrap = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "previousdesktopcolumn")) {
+        a = action_new(action_previous_desktop_column);
+        a->data.nextprevdesktop.wrap = FALSE;
+    } else if (!g_ascii_strcasecmp(name, "previousdesktopcolumnwrap")) {
+        a = action_new(action_previous_desktop_column);
+        a->data.nextprevdesktop.wrap = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "nextdesktoprow")) {
+        a = action_new(action_next_desktop_row);
+        a->data.nextprevdesktop.wrap = FALSE;
+    } else if (!g_ascii_strcasecmp(name, "nextdesktoprowwrap")) {
+        a = action_new(action_next_desktop_row);
+        a->data.nextprevdesktop.wrap = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "previousdesktoprow")) {
+        a = action_new(action_previous_desktop_row);
+        a->data.nextprevdesktop.wrap = FALSE;
+    } else if (!g_ascii_strcasecmp(name, "previousdesktoprowwrap")) {
+        a = action_new(action_previous_desktop_row);
+        a->data.nextprevdesktop.wrap = TRUE;
+    } else if (!g_ascii_strcasecmp(name, "move")) {
+        a = action_new(action_move);
+    } else if (!g_ascii_strcasecmp(name, "resize")) {
+        a = action_new(action_resize);
+    } else if (!g_ascii_strcasecmp(name, "restart")) {
+        a = action_new(action_restart);
+    } else if (!g_ascii_strcasecmp(name, "exit")) {
+        a = action_new(action_exit);
+    }
+    return a;
+}
+
 void action_execute(union ActionData *data)
 {
     GError *e = NULL;
-    if (!g_spawn_command_line_async(data->execute.path, &e)) {
-        g_warning("failed to execute '%s': %s",
-                  data->execute.path, e->message);
-    }
+    if (data->execute.path)
+        if (!g_spawn_command_line_async(data->execute.path, &e)) {
+            g_warning("failed to execute '%s': %s",
+                      data->execute.path, e->message);
+        }
 }
 
 void action_focus(union ActionData *data)
 {
-    client_focus(data->client.c);
+    if (data->client.c)
+        client_focus(data->client.c);
 }
 
 void action_unfocus (union ActionData *data)
 {
-    client_unfocus(data->client.c);
+    if (data->client.c)
+        client_unfocus(data->client.c);
 }
 
 void action_iconify(union ActionData *data)
 {
-    client_iconify(data->client.c, TRUE, TRUE);
+    if (data->client.c)
+        client_iconify(data->client.c, TRUE, TRUE);
 }
 
 void action_focusraise(union ActionData *data)
 {
-    client_focus(data->client.c);
-    stacking_raise(data->client.c);
+    if (data->client.c) {
+        client_focus(data->client.c);
+        stacking_raise(data->client.c);
+    }
 }
 
 void action_raise(union ActionData *data)
 {
-    stacking_raise(data->client.c);
+    if (data->client.c)
+        stacking_raise(data->client.c);
 }
 
 void action_lower(union ActionData *data)
 {
-    stacking_lower(data->client.c);
+    if (data->client.c)
+        stacking_lower(data->client.c);
 }
 
 void action_close(union ActionData *data)
 {
-    client_close(data->client.c);
+    if (data->client.c)
+        client_close(data->client.c);
 }
 
 void action_kill(union ActionData *data)
 {
-    client_kill(data->client.c);
+    if (data->client.c)
+        client_kill(data->client.c);
 }
 
 void action_shade(union ActionData *data)
 {
-    client_shade(data->client.c, TRUE);
+    if (data->client.c)
+        client_shade(data->client.c, TRUE);
 }
 
 void action_unshade(union ActionData *data)
 {
-    client_shade(data->client.c, FALSE);
+    if (data->client.c)
+        client_shade(data->client.c, FALSE);
 }
 
 void action_toggle_shade(union ActionData *data)
 {
-    client_shade(data->client.c, !data->client.c->shaded);
+    if (data->client.c)
+        client_shade(data->client.c, !data->client.c->shaded);
 }
 
 void action_toggle_omnipresent(union ActionData *data)
+{ 
+    if (data->client.c)
+        client_set_desktop(data->client.c,
+                           data->client.c->desktop == DESKTOP_ALL ?
+                           screen_desktop : DESKTOP_ALL, FALSE);
+}
+
+void action_move_relative_horz(union ActionData *data)
+{
+    Client *c = data->relative.c;
+    if (c)
+        client_configure(c, Corner_TopLeft,
+                         c->area.x + data->relative.delta, c->area.y,
+                         c->area.width, c->area.height, TRUE, TRUE);
+}
+
+void action_move_relative_vert(union ActionData *data)
 {
-    client_set_desktop(data->client.c, data->client.c->desktop == DESKTOP_ALL ?
-                       screen_desktop : DESKTOP_ALL);
+    Client *c = data->relative.c;
+    if (c)
+        client_configure(c, Corner_TopLeft,
+                         c->area.x, c->area.y + data->relative.delta,
+                         c->area.width, c->area.height, TRUE, TRUE);
 }
 
-void action_move_relative(union ActionData *data)
+void action_resize_relative_horz(union ActionData *data)
 {
     Client *c = data->relative.c;
-    client_configure(c, Corner_TopLeft,
-                     c->area.x + data->relative.dx,
-                     c->area.y + data->relative.dy,
-                     c->area.width, c->area.height, TRUE, TRUE);
+    if (c)
+        client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
+                         c->area.width + data->relative.delta,
+                         c->area.height, TRUE, TRUE);
 }
 
-void action_resize_relative(union ActionData *data)
+void action_resize_relative_vert(union ActionData *data)
 {
     Client *c = data->relative.c;
-    client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
-                     c->area.width + data->relative.dx,
-                     c->area.height + data->relative.dy, TRUE, TRUE);
+    if (c)
+        client_configure(c, Corner_TopLeft, c->area.x, c->area.y,
+                         c->area.width, c->area.height + data->relative.delta,
+                         TRUE, TRUE);
 }
 
 void action_maximize_full(union ActionData *data)
 {
-    client_maximize(data->client.c, TRUE, 0, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c, TRUE, 0, TRUE);
 }
 
 void action_unmaximize_full(union ActionData *data)
 {
-    client_maximize(data->client.c, FALSE, 0, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c, FALSE, 0, TRUE);
 }
 
 void action_toggle_maximize_full(union ActionData *data)
 {
-    client_maximize(data->client.c,
-                    !(data->client.c->max_horz || data->client.c->max_vert),
-                    0, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c,
+                        !(data->client.c->max_horz ||
+                          data->client.c->max_vert),
+                        0, TRUE);
 }
 
 void action_maximize_horz(union ActionData *data)
 {
-    client_maximize(data->client.c, TRUE, 1, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c, TRUE, 1, TRUE);
 }
 
 void action_unmaximize_horz(union ActionData *data)
 {
-    client_maximize(data->client.c, FALSE, 1, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c, FALSE, 1, TRUE);
 }
 
 void action_toggle_maximize_horz(union ActionData *data)
 {
-    client_maximize(data->client.c, !data->client.c->max_horz, 1, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c, !data->client.c->max_horz, 1, TRUE);
 }
 
 void action_maximize_vert(union ActionData *data)
 {
-    client_maximize(data->client.c, TRUE, 2, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c, TRUE, 2, TRUE);
 }
 
 void action_unmaximize_vert(union ActionData *data)
 {
-    client_maximize(data->client.c, FALSE, 2, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c, FALSE, 2, TRUE);
 }
 
 void action_toggle_maximize_vert(union ActionData *data)
 {
-    client_maximize(data->client.c, !data->client.c->max_vert, 2, TRUE);
+    if (data->client.c)
+        client_maximize(data->client.c, !data->client.c->max_vert, 2, TRUE);
 }
 
 void action_send_to_desktop(union ActionData *data)
 {
-    if (data->sendto.desktop < screen_num_desktops ||
-        data->sendto.desktop == DESKTOP_ALL)
-        client_set_desktop(data->sendto.c, data->sendto.desktop);
+    if (data->sendto.c)
+        if (data->sendto.desktop < screen_num_desktops ||
+            data->sendto.desktop == DESKTOP_ALL)
+            client_set_desktop(data->sendto.c, data->sendto.desktop, TRUE);
 }
 
 void action_send_to_next_desktop(union ActionData *data)
 {
     guint d;
 
+    if (!data->sendto.c) return;
+
     d = screen_desktop + 1;
     if (d >= screen_num_desktops) {
         if (!data->sendtonextprev.wrap) return;
         d = 0;
     }
-    client_set_desktop(data->sendtonextprev.c, d);
+    client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow);
     if (data->sendtonextprev.follow) screen_set_desktop(d);
 }
 
@@ -187,12 +358,14 @@ void action_send_to_previous_desktop(union ActionData *data)
 {
     guint d;
 
+    if (!data->sendto.c) return;
+
     d = screen_desktop - 1;
     if (d >= screen_num_desktops) {
         if (!data->sendtonextprev.wrap) return;
         d = screen_num_desktops - 1;
     }
-    client_set_desktop(data->sendtonextprev.c, d);
+    client_set_desktop(data->sendtonextprev.c, d, data->sendtonextprev.follow);
     if (data->sendtonextprev.follow) screen_set_desktop(d);
 }
 
@@ -407,6 +580,8 @@ void action_move(union ActionData *data)
     int x = data->move.x;
     int y = data->move.y;
 
+    if (!c || !client_normal(c)) return;
+
     dispatch_move(c, &x, &y);
 
     frame_frame_gravity(c->frame, &x, &y); /* get where the client should be */
@@ -419,9 +594,22 @@ void action_resize(union ActionData *data)
     Client *c = data->resize.c;
     int w = data->resize.x - c->frame->size.left - c->frame->size.right;
     int h = data->resize.y - c->frame->size.top - c->frame->size.bottom;
+ 
+    if (!c || !client_normal(c)) return;
 
     /* XXX window snapping/struts */
 
     client_configure(c, data->resize.corner, c->area.x, c->area.y, w, h,
                      TRUE, data->resize.final);
 }
+
+void action_restart(union ActionData *data)
+{
+    ob_restart_path = data->execute.path;
+    ob_shutdown = ob_restart = TRUE;
+}
+
+void action_exit(union ActionData *data)
+{
+    ob_shutdown = TRUE;
+}