From 82ab78a4a0d3ffa46cab5d8a859599ea7e020f07 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 8 May 2007 00:29:06 +0000 Subject: [PATCH] merge r6165-6166 from trunk --- openbox/focus.c | 8 ++++---- openbox/menuframe.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openbox/focus.c b/openbox/focus.c index eea8d148..15c036dc 100644 --- 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 01d3ae1f..65571761 100644 --- 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); } -- 2.34.1