X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=a616db64b2de0c86121c848cf86a5b489453dae4;hb=965ed8907a5dd81d5ffbc93b67a672fa78833854;hp=7774076785e43050fcbd61c0172117b7afae9f76;hpb=39d94f0db04dc62bf44a24e152550e504cb6649d;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 77740767..a616db64 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -19,14 +19,12 @@ #include "focus_cycle.h" #include "focus_cycle_indicator.h" -#include "focus_cycle_popup.h" #include "client.h" #include "frame.h" #include "focus.h" #include "screen.h" #include "openbox.h" #include "debug.h" -#include "group.h" #include #include @@ -37,17 +35,10 @@ static gboolean focus_cycle_all_desktops; static gboolean focus_cycle_dock_windows; static gboolean focus_cycle_desktop_windows; -static gboolean focus_target_has_siblings (ObClient *ft, - gboolean iconic_windows, - gboolean all_desktops); -static ObClient *focus_find_directional (ObClient *c, - ObDirection dir, - gboolean dock_windows, - gboolean desktop_windows); -static ObClient *focus_find_directional (ObClient *c, - ObDirection dir, - gboolean dock_windows, - gboolean desktop_windows); +static ObClient *focus_find_directional(ObClient *c, + ObDirection dir, + gboolean dock_windows, + gboolean desktop_windows); void focus_cycle_startup(gboolean reconfig) { @@ -64,115 +55,24 @@ void focus_cycle_stop(ObClient *ifclient) /* stop focus cycling if the given client is a valid focus target, and so the cycling is being disrupted */ if (focus_cycle_target && ifclient && - focus_cycle_target_valid(ifclient, - focus_cycle_iconic_windows, - focus_cycle_all_desktops, - focus_cycle_dock_windows, - focus_cycle_desktop_windows)) + (ifclient == focus_cycle_target || + focus_cycle_popup_is_showing(ifclient))) { - focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); - focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE); + focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); } } -/*! Returns if a focus target has valid group siblings that can be cycled - to in its place */ -static gboolean focus_target_has_siblings(ObClient *ft, - gboolean iconic_windows, - gboolean all_desktops) - +ObClient* focus_cycle(gboolean forward, gboolean all_desktops, + gboolean dock_windows, gboolean desktop_windows, + gboolean linear, gboolean interactive, + gboolean showbar, ObFocusCyclePopupMode mode, + gboolean done, gboolean cancel) { - GSList *it; - - if (!ft->group) return FALSE; - - for (it = ft->group->members; it; it = g_slist_next(it)) { - ObClient *c = it->data; - /* check that it's not a helper window to avoid infinite recursion */ - if (c != ft && !client_helper(c) && - focus_cycle_target_valid(c, iconic_windows, all_desktops, FALSE, - FALSE)) - { - return TRUE; - } - } - return FALSE; -} - -gboolean focus_cycle_target_valid(ObClient *ft, - gboolean iconic_windows, - gboolean all_desktops, - gboolean dock_windows, - gboolean desktop_windows) -{ - gboolean ok = FALSE; - - /* it's on this desktop unless you want all desktops. - - do this check first because it will usually filter out the most - windows */ - ok = (all_desktops || ft->desktop == screen_desktop || - ft->desktop == DESKTOP_ALL); - - /* the window can receive focus somehow */ - ok = ok && (ft->can_focus || ft->focus_notify); - - /* the window is not iconic, or we're allowed to go to iconic ones */ - ok = ok && (iconic_windows || !ft->iconic); - - /* it's the right type of window */ - if (dock_windows || desktop_windows) - ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) || - (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP)); - /* modal windows are important and can always get focus if they are - visible and stuff, so don't change 'ok' based on their type */ - else if (!ft->modal) - /* normal non-helper windows are valid targets */ - ok = ok && - ((client_normal(ft) && !client_helper(ft)) - || - /* helper windows are valid targets it... */ - (client_helper(ft) && - /* ...a window in its group already has focus ... */ - ((focus_client && ft->group == focus_client->group) || - /* ... or if there are no other windows in its group - that can be cycled to 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 - expected to set this hint, or modal) */ - ok = ok && ((ft->type == OB_CLIENT_TYPE_DOCK || - ft->type == OB_CLIENT_TYPE_DESKTOP || - ft->type == OB_CLIENT_TYPE_TOOLBAR || - ft->type == OB_CLIENT_TYPE_MENU || - ft->type == OB_CLIENT_TYPE_UTILITY) || - ft->modal || - !ft->skip_taskbar); - - /* it's not going to just send focus off somewhere else (modal window), - unless that modal window is not one of our valid targets, then let - you choose this window and bring the modal one here */ - { - ObClient *cft = client_focus_target(ft); - ok = ok && (ft == cft || !focus_cycle_target_valid(cft, - iconic_windows, - all_desktops, - dock_windows, - desktop_windows)); - } - - return ok; -} - -void focus_cycle(gboolean forward, gboolean all_desktops, - gboolean dock_windows, gboolean desktop_windows, - gboolean linear, gboolean interactive, - gboolean dialog, gboolean done, gboolean cancel) -{ - static ObClient *t = NULL; static GList *order = NULL; GList *it, *start, *list; ObClient *ft = NULL; + ObClient *ret = NULL; if (interactive) { if (cancel) { @@ -192,7 +92,6 @@ void focus_cycle(gboolean forward, gboolean all_desktops, list = client_list; } - if (focus_cycle_target == NULL) { focus_cycle_iconic_windows = TRUE; focus_cycle_all_desktops = all_desktops; @@ -215,25 +114,26 @@ void focus_cycle(gboolean forward, gboolean all_desktops, if (it == NULL) it = g_list_last(list); } ft = it->data; - if (focus_cycle_target_valid(ft, - focus_cycle_iconic_windows, - focus_cycle_all_desktops, - focus_cycle_dock_windows, - focus_cycle_desktop_windows)) + if (focus_valid_target(ft, TRUE, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, + focus_cycle_dock_windows, + focus_cycle_desktop_windows, + FALSE)) { if (interactive) { if (ft != focus_cycle_target) { /* prevents flicker */ focus_cycle_target = ft; - focus_cycle_draw_indicator(ft); + focus_cycle_draw_indicator(showbar ? ft : NULL); } - if (dialog) - /* same arguments as focus_target_valid */ - focus_cycle_popup_show(ft, - focus_cycle_iconic_windows, - focus_cycle_all_desktops, - focus_cycle_dock_windows, - focus_cycle_desktop_windows); - return; + /* same arguments as focus_target_valid */ + focus_cycle_popup_show(ft, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, + focus_cycle_dock_windows, + focus_cycle_desktop_windows, + mode); + return focus_cycle_target; } else if (ft != focus_cycle_target) { focus_cycle_target = ft; done = TRUE; @@ -243,10 +143,8 @@ void focus_cycle(gboolean forward, gboolean all_desktops, } while (it != start); done_cycle: - if (done && focus_cycle_target) - client_activate(focus_cycle_target, FALSE, TRUE); + if (done && !cancel) ret = focus_cycle_target; - t = NULL; focus_cycle_target = NULL; g_list_free(order); order = NULL; @@ -256,13 +154,13 @@ done_cycle: focus_cycle_popup_hide(); } - return; + return ret; } /* this be mostly ripped from fvwm */ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, gboolean dock_windows, - gboolean desktop_windows) + gboolean desktop_windows) { gint my_cx, my_cy, his_cx, his_cy; gint offset = 0; @@ -287,8 +185,8 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, /* the currently selected window isn't interesting */ if (cur == c) continue; - if (!focus_cycle_target_valid(it->data, FALSE, FALSE, dock_windows, - desktop_windows)) + if (!focus_valid_target(it->data, TRUE, FALSE, FALSE, dock_windows, + desktop_windows, FALSE)) continue; /* find the centre coords of this window, from the @@ -355,20 +253,20 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, return best_client; } -void focus_directional_cycle(ObDirection dir, gboolean dock_windows, - gboolean desktop_windows, gboolean interactive, - gboolean dialog, gboolean done, gboolean cancel) +ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows, + gboolean desktop_windows, + gboolean interactive, + gboolean showbar, gboolean dialog, + gboolean done, gboolean cancel) { static ObClient *first = NULL; ObClient *ft = NULL; - - if (!interactive) - return; + ObClient *ret = NULL; if (cancel) { focus_cycle_target = NULL; goto done_cycle; - } else if (done) + } else if (done && interactive) goto done_cycle; if (!focus_order) @@ -392,33 +290,31 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, GList *it; for (it = focus_order; it; it = g_list_next(it)) - if (focus_cycle_target_valid(it->data, - focus_cycle_iconic_windows, - focus_cycle_all_desktops, - focus_cycle_dock_windows, - focus_cycle_desktop_windows)) + if (focus_valid_target(it->data, TRUE, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, + focus_cycle_dock_windows, + focus_cycle_desktop_windows, FALSE)) ft = it->data; } - - if (ft) { - if (ft != focus_cycle_target) {/* prevents flicker */ - focus_cycle_target = ft; - focus_cycle_draw_indicator(ft); - } + + if (ft && ft != focus_cycle_target) {/* prevents flicker */ + focus_cycle_target = ft; + if (!interactive) + goto done_cycle; + focus_cycle_draw_indicator(showbar ? ft : NULL); } - if (focus_cycle_target && dialog) { + if (focus_cycle_target && dialog) /* same arguments as focus_target_valid */ focus_cycle_popup_single_show(focus_cycle_target, focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows); - return; - } + return focus_cycle_target; done_cycle: - if (done && focus_cycle_target) - client_activate(focus_cycle_target, FALSE, TRUE); + if (done && !cancel) ret = focus_cycle_target; first = NULL; focus_cycle_target = NULL; @@ -426,5 +322,5 @@ done_cycle: focus_cycle_draw_indicator(NULL); focus_cycle_popup_single_hide(); - return; + return ret; }