X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fdesktop.c;h=50caa22ffa0b231caba07ce84bc7f8bc4e7af29e;hb=b89cc5859068fd5543dc9e7da3f469fb0c0a7a1c;hp=2d2014e40024950fab13ce092dc98563fd6e9b4e;hpb=6973d5b8a50844ef8eecf076f8f15d5ece4270ef;p=chaz%2Fopenbox

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 2d2014e4..50caa22f 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -1,50 +1,349 @@
 #include "openbox/actions.h"
 #include "openbox/screen.h"
+#include "openbox/client.h"
 #include <glib.h>
 
+typedef enum {
+    LAST,
+    RELATIVE,
+    ABSOLUTE
+} SwitchType;
+
 typedef struct {
-    guint desktop;
+    SwitchType type;
+    union {
+        struct {
+            guint desktop;
+        } abs;
+
+        struct {
+            gboolean linear;
+            gboolean wrap;
+            ObDirection dir;
+        } rel;
+    } u;
+    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);
+/* 3.4-compatibility */
+static gpointer setup_go_last_func(xmlNodePtr node);
+static gpointer setup_send_last_func(xmlNodePtr node);
+static gpointer setup_go_abs_func(xmlNodePtr node);
+static gpointer setup_send_abs_func(xmlNodePtr node);
+static gpointer setup_go_next_func(xmlNodePtr node);
+static gpointer setup_send_next_func(xmlNodePtr node);
+static gpointer setup_go_prev_func(xmlNodePtr node);
+static gpointer setup_send_prev_func(xmlNodePtr node);
+static gpointer setup_go_left_func(xmlNodePtr node);
+static gpointer setup_send_left_func(xmlNodePtr node);
+static gpointer setup_go_right_func(xmlNodePtr node);
+static gpointer setup_send_right_func(xmlNodePtr node);
+static gpointer setup_go_up_func(xmlNodePtr node);
+static gpointer setup_send_up_func(xmlNodePtr node);
+static gpointer setup_go_down_func(xmlNodePtr node);
+static gpointer setup_send_down_func(xmlNodePtr node);
 
-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);
+    /* 3.4-compatibility */
+    actions_register("DesktopLast", setup_go_last_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopLast", setup_send_last_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("Desktop", setup_go_abs_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktop", setup_send_abs_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("DesktopNext", setup_go_next_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopNext", setup_send_next_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("DesktopPrevious", setup_go_prev_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopPrevious", setup_send_prev_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("DesktopLeft", setup_go_left_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopLeft", setup_send_left_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("DesktopRight", setup_go_right_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopRight", setup_send_right_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("DesktopUp", setup_go_up_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopUp", setup_send_up_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("DesktopDown", setup_go_down_func, g_free, run_func,
+                     NULL, NULL);
+    actions_register("SendToDesktopDown", setup_send_down_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 there are no options given */
+    o->type = ABSOLUTE;
+    o->u.abs.desktop = screen_desktop;
+    /* wrap by default - it's handy! */
+    o->u.rel.wrap = TRUE;
+
+    if ((n = obt_parse_find_node(node, "to"))) {
+        gchar *s = obt_parse_node_string(n);
+        if (!g_ascii_strcasecmp(s, "last"))
+            o->type = LAST;
+        else if (!g_ascii_strcasecmp(s, "next")) {
+            o->type = RELATIVE;
+            o->u.rel.linear = TRUE;
+            o->u.rel.dir = OB_DIRECTION_EAST;
+        }
+        else if (!g_ascii_strcasecmp(s, "previous")) {
+            o->type = RELATIVE;
+            o->u.rel.linear = TRUE;
+            o->u.rel.dir = OB_DIRECTION_WEST;
+        }
+        else if (!g_ascii_strcasecmp(s, "north") ||
+                 !g_ascii_strcasecmp(s, "up")) {
+            o->type = RELATIVE;
+            o->u.rel.dir = OB_DIRECTION_NORTH;
+        }
+        else if (!g_ascii_strcasecmp(s, "south") ||
+                 !g_ascii_strcasecmp(s, "down")) {
+            o->type = RELATIVE;
+            o->u.rel.dir = OB_DIRECTION_SOUTH;
+        }
+        else if (!g_ascii_strcasecmp(s, "west") ||
+                 !g_ascii_strcasecmp(s, "left")) {
+            o->type = RELATIVE;
+            o->u.rel.dir = OB_DIRECTION_WEST;
+        }
+        else if (!g_ascii_strcasecmp(s, "east") ||
+                 !g_ascii_strcasecmp(s, "right")) {
+            o->type = RELATIVE;
+            o->u.rel.dir = OB_DIRECTION_EAST;
+        }
+        else {
+            o->type = ABSOLUTE;
+            o->u.abs.desktop = atoi(s) - 1;
+        }
+        g_free(s);
+    }
+
+    if ((n = obt_parse_find_node(node, "wrap")))
+        o->u.rel.wrap = obt_parse_node_bool(n);
 
-    if ((n = parse_find_node("desktop", node)))
-        o->desktop = parse_int(doc, n) - 1;
     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 */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
     Options *o = options;
+    guint d;
 
-    if (o->desktop < screen_num_desktops)
-        screen_set_desktop(o->desktop, TRUE);
+    switch (o->type) {
+    case LAST:
+        d = screen_last_desktop;
+        break;
+    case ABSOLUTE:
+        d = o->u.abs.desktop;
+        break;
+    case RELATIVE:
+        d = screen_find_desktop(screen_desktop,
+                                o->u.rel.dir, o->u.rel.wrap, o->u.rel.linear);
+        break;
+    }
 
+    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);
+            if (data->client)
+                client_bring_helper_windows(data->client);
+        }
+
+        actions_client_move(data, FALSE);
+    }
     return FALSE;
 }
+
+/* 3.4-compatilibity */
+static gpointer setup_follow(xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o = g_new0(Options, 1);
+    o->send = TRUE;
+    o->follow = TRUE;
+    if ((n = obt_parse_find_node(node, "follow")))
+        o->follow = obt_parse_node_bool(n);
+    return o;
+}
+
+static gpointer setup_go_last_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    o->type = LAST;
+    return o;
+}
+
+static gpointer setup_send_last_func(xmlNodePtr node)
+{
+    Options *o = setup_follow(node);
+    o->type = LAST;
+    return o;
+}
+
+static gpointer setup_go_abs_func(xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o = g_new0(Options, 1);
+    o->type = ABSOLUTE;
+    if ((n = obt_parse_find_node(node, "desktop")))
+        o->u.abs.desktop = obt_parse_node_int(n) - 1;
+    else
+        o->u.abs.desktop = screen_desktop;
+    return o;
+}
+
+static gpointer setup_send_abs_func(xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o = setup_follow(node);
+    o->type = ABSOLUTE;
+    if ((n = obt_parse_find_node(node, "desktop")))
+        o->u.abs.desktop = obt_parse_node_int(n) - 1;
+    else
+        o->u.abs.desktop = screen_desktop;
+    return o;
+}
+
+static void setup_rel(Options *o, xmlNodePtr node, gboolean lin, ObDirection dir)
+{
+    xmlNodePtr n;
+
+    o->type = RELATIVE;
+    o->u.rel.linear = lin;
+    o->u.rel.dir = dir;
+    o->u.rel.wrap = TRUE;
+
+    if ((n = obt_parse_find_node(node, "wrap")))
+        o->u.rel.wrap = obt_parse_node_bool(n);
+}
+
+static gpointer setup_go_next_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    setup_rel(o, node, TRUE, OB_DIRECTION_EAST);
+    return o;
+}
+
+static gpointer setup_send_next_func(xmlNodePtr node)
+{
+    Options *o = setup_follow(node);
+    setup_rel(o, node, TRUE, OB_DIRECTION_EAST);
+    return o;
+}
+
+static gpointer setup_go_prev_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    setup_rel(o, node, TRUE, OB_DIRECTION_WEST);
+    return o;
+}
+
+static gpointer setup_send_prev_func(xmlNodePtr node)
+{
+    Options *o = setup_follow(node);
+    setup_rel(o, node, TRUE, OB_DIRECTION_WEST);
+    return o;
+}
+
+static gpointer setup_go_left_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    setup_rel(o, node, FALSE, OB_DIRECTION_WEST);
+    return o;
+}
+
+static gpointer setup_send_left_func(xmlNodePtr node)
+{
+    Options *o = setup_follow(node);
+    setup_rel(o, node, FALSE, OB_DIRECTION_WEST);
+    return o;
+}
+
+static gpointer setup_go_right_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    setup_rel(o, node, FALSE, OB_DIRECTION_EAST);
+    return o;
+}
+
+static gpointer setup_send_right_func(xmlNodePtr node)
+{
+    Options *o = setup_follow(node);
+    setup_rel(o, node, FALSE, OB_DIRECTION_EAST);
+    return o;
+}
+
+static gpointer setup_go_up_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    setup_rel(o, node, FALSE, OB_DIRECTION_NORTH);
+    return o;
+}
+
+static gpointer setup_send_up_func(xmlNodePtr node)
+{
+    Options *o = setup_follow(node);
+    setup_rel(o, node, FALSE, OB_DIRECTION_NORTH);
+    return o;
+}
+
+static gpointer setup_go_down_func(xmlNodePtr node)
+{
+    Options *o = g_new0(Options, 1);
+    setup_rel(o, node, FALSE, OB_DIRECTION_SOUTH);
+    return o;
+}
+
+static gpointer setup_send_down_func(xmlNodePtr node)
+{
+    Options *o = setup_follow(node);
+    setup_rel(o, node, FALSE, OB_DIRECTION_SOUTH);
+    return o;
+}