X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=f7389cb341a28b74a11343669ff13538fa70e2ea;hb=825426373cec4e4cc25f5056b2b54bb00ab28653;hp=82831ed122b0c213b4436236e9f0485e12d16869;hpb=598bf575c83a7ebc1be9029d70ea4197ced39d99;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 82831ed1..f7389cb3 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -234,7 +234,7 @@ void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact)
 
 void setup_action_desktop(ObAction **a, ObUserAction uact)
 {
-    (*a)->data.desktop.inter.any.interactive = TRUE;
+    (*a)->data.desktop.inter.any.interactive = FALSE;
 }
 
 void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
@@ -1054,6 +1054,8 @@ void action_lower(union ActionData *data)
     client_action_start(data);
     stacking_lower(CLIENT_AS_WINDOW(data->client.any.c));
     client_action_end(data);
+
+    focus_order_to_bottom(data->client.any.c);
 }
 
 void action_close(union ActionData *data)
@@ -1234,7 +1236,7 @@ void action_desktop(union ActionData *data)
         screen_set_desktop(first);
     }
 
-    if (data->inter.any.interactive && data->inter.final) {
+    if (!data->inter.any.interactive || data->inter.final) {
         screen_desktop_popup(0, FALSE);
         first = (unsigned) -1;
     }
@@ -1251,7 +1253,8 @@ void action_desktop_dir(union ActionData *data)
                              data->desktopdir.inter.final,
                              data->desktopdir.inter.cancel);
     if (!data->sendtodir.inter.any.interactive ||
-        !data->sendtodir.inter.final)
+        !data->sendtodir.inter.final ||
+        data->sendtodir.inter.cancel)
     {
         screen_set_desktop(d);
     }
@@ -1270,7 +1273,8 @@ void action_send_to_desktop_dir(union ActionData *data)
                              data->sendtodir.inter.final,
                              data->sendtodir.inter.cancel);
     if (!data->sendtodir.inter.any.interactive ||
-        !data->sendtodir.inter.final)
+        !data->sendtodir.inter.final ||
+        data->sendtodir.inter.cancel)
     {
         client_set_desktop(c, d, data->sendtodir.follow);
         if (data->sendtodir.follow)