X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Faction.c;h=7379c0ee980224c1f67468405bc6c5d78718f2f1;hb=485fbff15da1a9001e610b3274747d76c1af57cb;hp=b035558dcfbcd770943682531920c19bb13c8c29;hpb=7b6ca7c20e2440d607c7d9d6c189f0821166bd84;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index b035558d..7379c0ee 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -8,7 +8,6 @@
 #include "frame.h"
 #include "screen.h"
 #include "action.h"
-#include "dispatch.h"
 #include "openbox.h"
 
 #include <glib.h>
@@ -82,6 +81,7 @@ void setup_action_directional_focus_northwest(ObAction *a)
 
 void setup_action_send_to_desktop(ObAction *a)
 {
+    a->data.sendto.follow = TRUE;
 }
 
 void setup_action_send_to_desktop_prev(ObAction *a)
@@ -89,6 +89,7 @@ void setup_action_send_to_desktop_prev(ObAction *a)
     a->data.sendtodir.dir = OB_DIRECTION_WEST;
     a->data.sendtodir.linear = TRUE;
     a->data.sendtodir.wrap = TRUE;
+    a->data.sendtodir.follow = TRUE;
 }
 
 void setup_action_send_to_desktop_next(ObAction *a)
@@ -96,6 +97,7 @@ void setup_action_send_to_desktop_next(ObAction *a)
     a->data.sendtodir.dir = OB_DIRECTION_EAST;
     a->data.sendtodir.linear = TRUE;
     a->data.sendtodir.wrap = TRUE;
+    a->data.sendtodir.follow = TRUE;
 }
 
 void setup_action_send_to_desktop_left(ObAction *a)
@@ -103,6 +105,7 @@ void setup_action_send_to_desktop_left(ObAction *a)
     a->data.sendtodir.dir = OB_DIRECTION_WEST;
     a->data.sendtodir.linear = FALSE;
     a->data.sendtodir.wrap = TRUE;
+    a->data.sendtodir.follow = TRUE;
 }
 
 void setup_action_send_to_desktop_right(ObAction *a)
@@ -110,6 +113,7 @@ void setup_action_send_to_desktop_right(ObAction *a)
     a->data.sendtodir.dir = OB_DIRECTION_EAST;
     a->data.sendtodir.linear = FALSE;
     a->data.sendtodir.wrap = TRUE;
+    a->data.sendtodir.follow = TRUE;
 }
 
 void setup_action_send_to_desktop_up(ObAction *a)
@@ -117,6 +121,7 @@ void setup_action_send_to_desktop_up(ObAction *a)
     a->data.sendtodir.dir = OB_DIRECTION_NORTH;
     a->data.sendtodir.linear = FALSE;
     a->data.sendtodir.wrap = TRUE;
+    a->data.sendtodir.follow = TRUE;
 }
 
 void setup_action_send_to_desktop_down(ObAction *a)
@@ -124,6 +129,7 @@ void setup_action_send_to_desktop_down(ObAction *a)
     a->data.sendtodir.dir = OB_DIRECTION_SOUTH;
     a->data.sendtodir.linear = FALSE;
     a->data.sendtodir.wrap = TRUE;
+    a->data.sendtodir.follow = TRUE;
 }
 
 void setup_action_desktop_prev(ObAction *a)
@@ -686,7 +692,7 @@ ObAction *action_from_string(char *name)
     return a;
 }
 
-ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node)
+ObAction *action_parse(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
 {
     char *actname;
     ObAction *act = NULL;
@@ -718,9 +724,14 @@ ObAction *action_parse(xmlDocPtr doc, xmlNodePtr node)
                 if ((n = parse_find_node("wrap", node->xmlChildrenNode))) {
                     act->data.desktopdir.wrap = parse_bool(doc, n);
                 }
+            } else if (act->func == action_send_to_desktop) {
+                if ((n = parse_find_node("follow", node->xmlChildrenNode)))
+                    act->data.sendto.follow = parse_bool(doc, n);
             } else if (act->func == action_send_to_desktop_dir) {
                 if ((n = parse_find_node("wrap", node->xmlChildrenNode)))
                     act->data.sendtodir.wrap = parse_bool(doc, n);
+                if ((n = parse_find_node("follow", node->xmlChildrenNode)))
+                    act->data.sendtodir.follow = parse_bool(doc, n);
             } else if (act->func == action_activate) {
                 if ((n = parse_find_node("here", node->xmlChildrenNode)))
                     act->data.activate.here = parse_bool(doc, n);
@@ -974,8 +985,9 @@ void action_send_to_desktop(union ActionData *data)
 
     if (data->sendto.desk < screen_num_desktops ||
         data->sendto.desk == DESKTOP_ALL) {
-        client_set_desktop(c, data->sendto.desk, TRUE);
-        screen_set_desktop(data->sendto.desk);
+        client_set_desktop(c, data->sendto.desk, data->sendto.follow);
+        if (data->sendto.follow)
+            screen_set_desktop(data->sendto.desk);
     }
 }
 
@@ -1006,8 +1018,9 @@ void action_send_to_desktop_dir(union ActionData *data)
     d = screen_cycle_desktop(data->sendtodir.dir, data->sendtodir.wrap,
                              data->sendtodir.linear,
                              data->sendtodir.final, data->sendtodir.cancel);
-    client_set_desktop(c, d, TRUE);
-    screen_set_desktop(d);
+    client_set_desktop(c, d, data->sendtodir.follow);
+    if (data->sendtodir.follow)
+        screen_set_desktop(d);
 }
 
 #if 0
@@ -1204,7 +1217,7 @@ void action_send_to_desktop_up(union ActionData *data)
 
 void action_toggle_decorations(union ActionData *data)
 {
-    ObClient *c = data->client.c;;
+    ObClient *c = data->client.c;
 
     if (!c) return;