X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Faction.c;h=081b68f5293b921d91f1ba94f138cf21dc1fb5af;hb=336011efb19600107313785b56c32dd12a69dc1f;hp=5900de7cd0c3ae05772317208457a25579afc20c;hpb=d30809e5faf681a00035d9913a762f25db8de6b5;p=chaz%2Fopenbox

diff --git a/openbox/action.c b/openbox/action.c
index 5900de7c..081b68f5 100644
--- 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,29 +39,25 @@
 
 #include <glib.h>
 
-inline void client_action_start(union ActionData *data)
+static void client_action_start(union ActionData *data)
 {
-    if (config_focus_follow)
-        if (data->any.context != OB_FRAME_CONTEXT_CLIENT && !data->any.button)
-            grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
 }
 
-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) {
-                ungrab_pointer();
-            } 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. */
             }
         }
 }
@@ -1141,9 +1138,15 @@ void action_run_list(GSList *acts, ObClient *c, ObFrameContext context,
 
             /* XXX UGLY HACK race with motion event starting a move and the
                button release gettnig processed first. answer: don't queue
-               moveresize starts. UGLY HACK XXX */
+               moveresize starts. UGLY HACK XXX
+
+               XXX ALSO don't queue showmenu events, because on button press
+               events we need to know if a mouse grab is going to take place,
+               and set the button to 0, so that later motion events don't think
+               that a drag is going on. since showmenu grabs the pointer..
+            */
             if (a->data.any.interactive || a->func == action_move ||
-                a->func == action_resize)
+                a->func == action_resize || a->func == action_showmenu)
             {
                 /* interactive actions are not queued */
                 a->func(&a->data);
@@ -1584,8 +1587,8 @@ 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)
-            screen_set_desktop(data->sendto.desk, TRUE);
+        if (data->sendto.follow && data->sendto.desk != screen_desktop)
+            screen_set_desktop(data->sendto.desk, c != focus_client);
     }
 }
 
@@ -1598,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);
     }
 }
 
@@ -1618,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);
     }
 }
 
@@ -1642,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);
     }
 }