diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-06 19:41:23 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-07-06 19:41:23 +0000 |
| commit | 0d0ce065df9ff1acc06fe63e4a0fe45c184de693 (patch) | |
| tree | 1d4837af35ef0263656360e6f91890b930b843d5 /openbox/focus.c | |
| parent | b3d26fdb20e5a939210265ecdf8e5b51340991c6 (diff) | |
don't focus helper windows that map unless there are no other valid targets in the group (don't move focus from a group window to a new helper window).
this fixes gucharmap.
Diffstat (limited to 'openbox/focus.c')
| -rw-r--r-- | openbox/focus.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/openbox/focus.c b/openbox/focus.c index 3a0905cc..9a0b2bdc 100644 --- a/openbox/focus.c +++ b/openbox/focus.c @@ -126,7 +126,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, 3. it is not shaded */ if ((allow_omnipresent || c->desktop == screen_desktop) && - focus_valid_target(c, FALSE, FALSE, FALSE, FALSE) && + focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, FALSE) && !c->shaded && (allow_refocus || client_focus_target(c) != old) && client_focus(c)) @@ -146,7 +146,7 @@ static ObClient* focus_fallback_target(gboolean allow_refocus, a splashscreen or a desktop window (save the desktop as a backup fallback though) */ - if (focus_valid_target(c, FALSE, FALSE, FALSE, TRUE) && + if (focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, TRUE) && (allow_refocus || client_focus_target(c) != old) && client_focus(c)) { @@ -284,7 +284,8 @@ static gboolean focus_target_has_siblings(ObClient *ft, ObClient *c = it->data; /* check that it's not a helper window to avoid infinite recursion */ if (c != ft && c->type == OB_CLIENT_TYPE_NORMAL && - focus_valid_target(c, iconic_windows, all_desktops, FALSE, FALSE)) + focus_valid_target(c, TRUE, iconic_windows, all_desktops, + FALSE, FALSE)) { return TRUE; } @@ -293,6 +294,7 @@ static gboolean focus_target_has_siblings(ObClient *ft, } gboolean focus_valid_target(ObClient *ft, + gboolean helper_windows, gboolean iconic_windows, gboolean all_desktops, gboolean dock_windows, @@ -326,10 +328,12 @@ gboolean focus_valid_target(ObClient *ft, || /* helper windows are valid targets if... */ (client_helper(ft) && - /* ...a window in its group already has focus ... */ - ((focus_client && ft->group == focus_client->group) || + /* ...a window in its group already has focus and we want to + include helper windows ... */ + ((focus_client && ft->group == focus_client->group && + helper_windows) || /* ... or if there are no other windows in its group - that can be cycled to instead */ + that can be focused instead */ !focus_target_has_siblings(ft, iconic_windows, all_desktops)))); /* it's not set to skip the taskbar (unless it is a type that would be @@ -348,6 +352,7 @@ gboolean focus_valid_target(ObClient *ft, { ObClient *cft = client_focus_target(ft); ok = ok && (ft == cft || !focus_valid_target(cft, + TRUE, iconic_windows, all_desktops, dock_windows, |