give focus to new windows when *any* relative already has focus..

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index 431b88c1de05606512fa29dcf529aee8549d9e92..faf065a12fedd0bf10057a27b7f14a2a43ff0efa 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -20,6 +20,7 @@
 #include "debug.h"
 #include "client.h"
 #include "focus.h"
+#include "focus_cycle.h"
 #include "moveresize.h"
 #include "menu.h"
 #include "prop.h"
@@ -38,26 +39,25 @@
 
 #include <glib.h>
 
-inline void client_action_start(union ActionData *data)
+static void client_action_start(union ActionData *data)
 {
 }
 
-inline void client_action_end(union ActionData *data)
+static void client_action_end(union ActionData *data)
 {
     if (config_focus_follow)
         if (data->any.context != OB_FRAME_CONTEXT_CLIENT) {
-            if (!data->any.button) {
-                event_ignore_queued_enters();
-            } else {
-                ObClient *c;
-
-                /* usually this is sorta redundant, but with a press action
-                   that moves windows our from under the cursor, the enter
-                   event will come as a GrabNotify which is ignored, so this
-                   makes a fake enter event
-                */
-                if ((c = client_under_pointer()))
-                    event_enter_client(c);
+            if (!data->any.button && data->any.c)
+                event_ignore_all_queued_enters();
+            else {
+                /* we USED to create a fake enter event here, so that when you
+                   used a Press context, and the button was still down,
+                   you could still get enter events that weren't
+                   NotifyWhileGrabbed.
+
+                   only problem with this is that then the resulting focus
+                   change events can ALSO be NotifyWhileGrabbed. And that is
+                   bad. So, don't create fake enter events anymore. */
             }
         }
 }
@@ -1587,7 +1587,7 @@ 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, data->sendto.follow);
-        if (data->sendto.follow)
+        if (data->sendto.follow && data->sendto.desk != screen_desktop)
             screen_set_desktop(data->sendto.desk, TRUE);
     }
 }
@@ -1621,7 +1621,8 @@ 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, TRUE);
     }
 }