prevent flicker in the follow actiosn again instead of in focus fallback. focus fallb...

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 1d815efc1056661e2992a48cd3c7025f3e2e2ffe..081b68f5293b921d91f1ba94f138cf21dc1fb5af 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -1588,7 +1588,7 @@ void action_send_to_desktop(union ActionData *data)
         data->sendto.desk == DESKTOP_ALL) {
         client_set_desktop(c, data->sendto.desk, data->sendto.follow);
         if (data->sendto.follow && data->sendto.desk != screen_desktop)
-            screen_set_desktop(data->sendto.desk, TRUE);
+            screen_set_desktop(data->sendto.desk, c != focus_client);
     }
 }
 
@@ -1601,7 +1601,7 @@ void action_desktop(union ActionData *data)
     {
         screen_set_desktop(data->desktop.desk, TRUE);
         if (data->inter.any.interactive)
-            screen_desktop_popup(data->desktop.desk, TRUE);
+            screen_desktop_popup(data->desktop.desk, focus_client->desktop != DESKTOP_ALL);
     }
 }
 
@@ -1621,7 +1621,7 @@ void action_desktop_dir(union ActionData *data)
     if (!data->sendtodir.inter.any.interactive ||
         (data->sendtodir.inter.final && !data->sendtodir.inter.cancel))
     {
-        if (d != screen_desktop) screen_set_desktop(d, TRUE);
+        if (d != screen_desktop) screen_set_desktop(d, focus_client->desktop != DESKTOP_ALL);
     }
 }
 
@@ -1645,7 +1645,7 @@ void action_send_to_desktop_dir(union ActionData *data)
     {
         client_set_desktop(c, d, data->sendtodir.follow);
         if (data->sendtodir.follow && d != screen_desktop)
-            screen_set_desktop(d, TRUE);
+            screen_set_desktop(d, c != focus_client);
     }
 }