all repos — openbox @ 89286cbe839ac2c7a8b1cc122326a4aa19cbb261

openbox fork - make it a bit more like ryudo 

fix problems with conflicing interactive desktop switching and send-to-ing
Dana Jansens danakj@orodu.net
commit

89286cbe839ac2c7a8b1cc122326a4aa19cbb261

parent

cc19a55f0e7d943b78011d36026aa71e4c9fdfb3

1 files changed, 12 insertions(+), 4 deletions(-)

jump to
M openbox/action.c → openbox/action.c 
@@ -1195,7 +1195,11 @@ data->sendtodir.linear,
                              data->desktopdir.inter.any.interactive,
                              data->desktopdir.inter.final,
                              data->desktopdir.inter.cancel);
-    screen_set_desktop(d);
+    if (!data->sendtodir.inter.any.interactive ||
+        !data->sendtodir.inter.final)
+    {
+        screen_set_desktop(d);
+    }
 }
 
 void action_send_to_desktop_dir(union ActionData *data)

@@ -1210,9 +1214,13 @@ data->sendtodir.linear,
                              data->sendtodir.inter.any.interactive,
                              data->sendtodir.inter.final,
                              data->sendtodir.inter.cancel);
-    client_set_desktop(c, d, data->sendtodir.follow);
-    if (data->sendtodir.follow)
-        screen_set_desktop(d);
+    if (!data->sendtodir.inter.any.interactive ||
+        !data->sendtodir.inter.final)
+    {
+        client_set_desktop(c, d, data->sendtodir.follow);
+        if (data->sendtodir.follow)
+            screen_set_desktop(d);
+    }
 }
 
 void action_desktop_last(union ActionData *data)