X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Factions%2Fdesktop.c;h=142fec513108f6a64abb3a6360ee39300436af4e;hb=f1c7a1c34386f3dddf1a8ef2e76e6ed7a7ab8f10;hp=3132a4fc253573453ab0107162de6b4a8b15caea;hpb=cfa96390e88eae67e8e5b29598f597303849002c;p=chaz%2Fopenbox

diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
index 3132a4fc..142fec51 100644
--- a/openbox/actions/desktop.c
+++ b/openbox/actions/desktop.c
@@ -21,26 +21,26 @@ typedef struct {
             gboolean wrap;
             ObDirection dir;
         } rel;
-    }
+    };
     gboolean send;
     gboolean follow;
 } Options;
 
-static gpointer setup_switch_func(ObParseInst *i, xmlDocPtr doc,
+static gpointer setup_go_func(ObParseInst *i, xmlDocPtr doc,
                                   xmlNodePtr node);
 static gpointer setup_send_func(ObParseInst *i, xmlDocPtr doc,
                                 xmlNodePtr node);
 static gboolean run_func(ObActionsData *data, gpointer options);
 
-void action_desktop_startup()
+void action_desktop_startup(void)
 {
-    actions_register("SwitchToDesktop", setup_switch_func, g_free, 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_switch_func(ObParseInst *i, xmlDocPtr doc,
+static gpointer setup_go_func(ObParseInst *i, xmlDocPtr doc,
                                   xmlNodePtr node)
 {
     xmlNodePtr n;
@@ -55,8 +55,7 @@ static gpointer setup_switch_func(ObParseInst *i, xmlDocPtr doc,
 
     if ((n = parse_find_node("to", node))) {
         gchar *s = parse_string(doc, n);
-        if (!g_ascii_strcasecmp(s, "last") ||
-            !g_ascii_strcasecmp(s, "previous"))
+        if (!g_ascii_strcasecmp(s, "last"))
             o->type = LAST;
         else if (!g_ascii_strcasecmp(s, "next")) {
             o->type = RELATIVE;
@@ -90,7 +89,7 @@ static gpointer setup_switch_func(ObParseInst *i, xmlDocPtr doc,
         }
         else {
             o->type = ABSOLUTE;
-            o->abs.desktop = parse_int(doc, n) - 1;
+            o->abs.desktop = atoi(s) - 1;
         }
         g_free(s);
     }
@@ -104,7 +103,10 @@ static gpointer setup_switch_func(ObParseInst *i, xmlDocPtr doc,
 static gpointer setup_send_func(ObParseInst *i, xmlDocPtr doc,
                                 xmlNodePtr node)
 {
-    Options *o = setup_switch_func(i, doc, node);
+    xmlNodePtr n;
+    Options *o;
+
+    o = setup_go_func(i, doc, node);
     o->send = TRUE;
     o->follow = TRUE;
 
@@ -120,7 +122,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
     Options *o = options;
     guint d;
 
-    
+
 
     switch (o->type) {
     case LAST:
@@ -130,22 +132,22 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         d = o->abs.desktop;
         break;
     case RELATIVE:
-        d = screen_cycle_desktop(o->abs.dir,
-                                 o->abs.wrap,
-                                 o->abs.linear,
-                                 FALSE, TRUE, FALSE);
+        d = screen_find_desktop(screen_desktop,
+                                o->rel.dir, o->rel.wrap, o->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);
+        actions_client_move(data, FALSE);
     }
     return FALSE;
 }