Merge branch 'backport' into work

[dana/openbox.git] / openbox / actions / desktop.c

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 6da4774..d5535f6 100644 (file)
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -1,48 +1,115 @@
 #include "openbox/actions.h"
 #include "openbox/screen.h"
+#include "openbox/client.h"
 #include <glib.h>
 
+typedef enum {
+    LAST,
+    RELATIVE,
+    ABSOLUTE
+} SwitchType;
+
 typedef struct {
-    gboolean last;
-    guint desktop;
+    SwitchType type;
+    union {
+        struct {
+            guint desktop;
+        } abs;
+
+        struct {
+            gboolean linear;
+            gboolean wrap;
+            ObDirection dir;
+        } rel;
+    };
+    gboolean send;
+    gboolean follow;
 } Options;
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
-static void     free_func(gpointer options);
+static gpointer setup_go_func(xmlNodePtr node);
+static gpointer setup_send_func(xmlNodePtr node);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_desktop_startup()
+void action_desktop_startup(void)
 {
-    actions_register("Desktop",
-                     setup_func,
-                     free_func,
-                     run_func,
+    actions_register("GoToDesktop", setup_go_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktop", setup_send_func, g_free, run_func,
                      NULL, NULL);
 }
 
-static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+static gpointer setup_go_func(xmlNodePtr node)
 {
     xmlNodePtr n;
     Options *o;
 
     o = g_new0(Options, 1);
+    /* don't go anywhere if theres no options given */
+    o->type = ABSOLUTE;
+    o->abs.desktop = screen_desktop;
+    /* wrap by default - it's handy! */
+    o->rel.wrap = TRUE;
 
-    if ((n = parse_find_node("desktop", node))) {
-        gchar *s = parse_string(doc, n);
+    if ((n = obt_parse_find_node(node, "to"))) {
+        gchar *s = obt_parse_node_string(n);
         if (!g_ascii_strcasecmp(s, "last"))
-            o->last = TRUE;
-        else
-            o->desktop = parse_int(doc, n) - 1;
+            o->type = LAST;
+        else if (!g_ascii_strcasecmp(s, "next")) {
+            o->type = RELATIVE;
+            o->rel.linear = TRUE;
+            o->rel.dir = OB_DIRECTION_EAST;
+        }
+        else if (!g_ascii_strcasecmp(s, "previous")) {
+            o->type = RELATIVE;
+            o->rel.linear = TRUE;
+            o->rel.dir = OB_DIRECTION_WEST;
+        }
+        else if (!g_ascii_strcasecmp(s, "north") ||
+                 !g_ascii_strcasecmp(s, "up")) {
+            o->type = RELATIVE;
+            o->rel.dir = OB_DIRECTION_NORTH;
+        }
+        else if (!g_ascii_strcasecmp(s, "south") ||
+                 !g_ascii_strcasecmp(s, "down")) {
+            o->type = RELATIVE;
+            o->rel.dir = OB_DIRECTION_SOUTH;
+        }
+        else if (!g_ascii_strcasecmp(s, "west") ||
+                 !g_ascii_strcasecmp(s, "left")) {
+            o->type = RELATIVE;
+            o->rel.dir = OB_DIRECTION_WEST;
+        }
+        else if (!g_ascii_strcasecmp(s, "east") ||
+                 !g_ascii_strcasecmp(s, "right")) {
+            o->type = RELATIVE;
+            o->rel.dir = OB_DIRECTION_EAST;
+        }
+        else {
+            o->type = ABSOLUTE;
+            o->abs.desktop = atoi(s) - 1;
+        }
         g_free(s);
     }
+
+    if ((n = obt_parse_find_node(node, "wrap")))
+        o->rel.wrap = obt_parse_node_bool(n);
+
     return o;
 }
 
-static void free_func(gpointer options)
+static gpointer setup_send_func(xmlNodePtr node)
 {
-    Options *o = options;
+    xmlNodePtr n;
+    Options *o;
 
-    g_free(o);
+    o = setup_go_func(node);
+    o->send = TRUE;
+    o->follow = TRUE;
+
+    if ((n = obt_parse_find_node(node, "follow")))
+        o->follow = obt_parse_node_bool(n);
+
+    return o;
 }
 
 /* Always return FALSE because its not interactive */
@@ -51,13 +118,32 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
     guint d;
 
-    if (o->last)
+
+
+    switch (o->type) {
+    case LAST:
         d = screen_last_desktop;
-    else
-        d = o->desktop;
+        break;
+    case ABSOLUTE:
+        d = o->abs.desktop;
+        break;
+    case RELATIVE:
+        d = screen_find_desktop(screen_desktop,
+                                o->rel.dir, o->rel.wrap, o->rel.linear);
+        break;
+    }
 
-    if (d < screen_num_desktops)
-        screen_set_desktop(d, TRUE);
+    if (d < screen_num_desktops && d != screen_desktop) {
+        gboolean go = TRUE;
 
+        actions_client_move(data, TRUE);
+        if (o->send && data->client && client_normal(data->client)) {
+            client_set_desktop(data->client, d, o->follow, FALSE);
+            go = o->follow;
+        }
+
+        if (go) screen_set_desktop(d, TRUE);
+        actions_client_move(data, FALSE);
+    }
     return FALSE;
 }