merge r6165-6166 from trunk

diff --git a/openbox/focus.c b/openbox/focus.c
index eea8d148579042319fed27e2fc72e1413f28c2c3..15c036dca7f49bc00b75e42a93aca4f9b8572579 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -562,10 +562,10 @@ static gboolean valid_focus_target(ObClient *ft,
 
     /* it's not set to skip the taskbar (unless it is a type that would be
        expected to set this hint */
-    ok = ok && (!(ft->type == OB_CLIENT_TYPE_DOCK ||
-                  ft->type == OB_CLIENT_TYPE_TOOLBAR ||
-                  ft->type == OB_CLIENT_TYPE_MENU ||
-                  ft->type == OB_CLIENT_TYPE_UTILITY) ||
+    ok = ok && ((ft->type == OB_CLIENT_TYPE_DOCK ||
+                 ft->type == OB_CLIENT_TYPE_TOOLBAR ||
+                 ft->type == OB_CLIENT_TYPE_MENU ||
+                 ft->type == OB_CLIENT_TYPE_UTILITY) ||
                 !ft->skip_taskbar);
 
     /* it's not going to just send fous off somewhere else (modal window) */

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 01d3ae1ff308b6c3b5513c619f637e740ef4f239..655717619102d0072f91b25084822289419fe1ed 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -972,10 +972,10 @@ static gboolean menu_frame_show(ObMenuFrame *self)
 
     if (menu_frame_visible == NULL) {
         /* no menus shown yet */
-        if (!grab_pointer(TRUE, TRUE, OB_CURSOR_POINTER))
+        if (!grab_pointer(TRUE, FALSE, OB_CURSOR_POINTER))
             return FALSE;
         if (!grab_keyboard(TRUE)) {
-            grab_pointer(FALSE, TRUE, OB_CURSOR_POINTER);
+            grab_pointer(FALSE, FALSE, OB_CURSOR_POINTER);
             return FALSE;
         }
     }
@@ -1084,7 +1084,7 @@ void menu_frame_hide(ObMenuFrame *self)
 
     if (menu_frame_visible == NULL) {
         /* last menu shown */
-        grab_pointer(FALSE, TRUE, OB_CURSOR_NONE);
+        grab_pointer(FALSE, FALSE, OB_CURSOR_NONE);
         grab_keyboard(FALSE);
     }