X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient_menu.c;h=cc67a4613568408d7f1e991ac8f93b8f64e85095;hb=15e6775b0c17220b81456188757362d131a436c8;hp=f538eafd7f36ae263a81e2feecd8bba0f932073a;hpb=9752670920352bdd721d9958370edc569481d9e6;p=chaz%2Fopenbox

diff --git a/openbox/client_menu.c b/openbox/client_menu.c
index f538eafd..cc67a461 100644
--- a/openbox/client_menu.c
+++ b/openbox/client_menu.c
@@ -19,6 +19,7 @@
 #include "debug.h"
 #include "menu.h"
 #include "menuframe.h"
+#include "config.h"
 #include "screen.h"
 #include "client.h"
 #include "openbox.h"
@@ -106,9 +107,13 @@ static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
                                 Time time)
 {
     gint x, y;
+    gulong ignore_start;
 
     g_assert(c);
 
+    if (!config_focus_under_mouse)
+        ignore_start = event_start_ignore_all_enters();
+
     switch (e->id) {
     case CLIENT_ICONIFY:
         /* the client won't be on screen anymore so hide the menu */
@@ -154,7 +159,8 @@ static void client_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
         g_assert_not_reached();
     }
 
-    event_ignore_all_queued_enters();
+    if (!config_focus_under_mouse)
+        event_end_ignore_all_enters(ignore_start);
 
     /* update the menu cuz stuff can have changed */
     if (f) {
@@ -199,8 +205,13 @@ static void layer_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
                                ObClient *c, guint state, gpointer data,
                                Time time)
 {
+    gulong ignore_start;
+
     g_assert(c);
 
+    if (!config_focus_under_mouse)
+        ignore_start = event_start_ignore_all_enters();
+
     switch (e->id) {
     case LAYER_TOP:
         client_set_layer(c, 1);
@@ -215,7 +226,8 @@ static void layer_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
         g_assert_not_reached();
     }
 
-    event_ignore_all_queued_enters();
+    if (!config_focus_under_mouse)
+        event_end_ignore_all_enters(ignore_start);
 
     /* update the menu cuz stuff can have changed */
     if (f) {
@@ -274,7 +286,7 @@ static void send_to_menu_execute(ObMenuEntry *e, ObMenuFrame *f,
 {
     g_assert(c);
 
-    client_set_desktop(c, e->id, FALSE);
+    client_set_desktop(c, e->id, FALSE, FALSE);
     /* the client won't even be on the screen anymore, so hide the menu */
     if (f)
         menu_frame_hide_all();