Add all the action names used in 3.4 so configs don't break

1 files changed, 198 insertions, 1 deletions

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index edd22aa2..50caa22f 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -29,6 +29,23 @@ typedef struct {
 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)
 {
@@ -36,6 +53,39 @@ void action_desktop_startup(void)
                      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_go_func(xmlNodePtr node)
@@ -44,7 +94,7 @@ static gpointer setup_go_func(xmlNodePtr node)
     Options *o;
 
     o = g_new0(Options, 1);
-    /* don't go anywhere if theres no options given */
+    /* 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! */
@@ -150,3 +200,150 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     }
     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;
+}