X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=de176501e562de9844b8327e86a44a93e8bea11b;hp=063de6447bfa3b5f44d9483a752e1ac768764888;hb=HEAD;hpb=4bf6b1b551be744be4fbe4d1faab5be12d051378 diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 063de644..de176501 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -29,9 +29,18 @@ #include #include +typedef enum { + OB_CYCLE_NONE = 0, + OB_CYCLE_NORMAL, + OB_CYCLE_DIRECTIONAL +} ObCycleType; + ObClient *focus_cycle_target = NULL; +static ObCycleType focus_cycle_type = OB_CYCLE_NONE; +static gboolean focus_cycle_linear; static gboolean focus_cycle_iconic_windows; static gboolean focus_cycle_all_desktops; +static gboolean focus_cycle_nonhilite_windows; static gboolean focus_cycle_dock_windows; static gboolean focus_cycle_desktop_windows; @@ -50,26 +59,50 @@ void focus_cycle_shutdown(gboolean reconfig) if (reconfig) return; } -void focus_cycle_stop(ObClient *ifclient) +void focus_cycle_addremove(ObClient *c, gboolean redraw) +{ + if (!focus_cycle_type) + return; + + if (focus_cycle_type == OB_CYCLE_DIRECTIONAL) { + if (c && focus_cycle_target == c) { + focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, + TRUE, TRUE, TRUE); + } + } + else if (c && redraw) { + gboolean v, s; + + v = focus_cycle_valid(c); + s = focus_cycle_popup_is_showing(c) || c == focus_cycle_target; + + if (v != s) + focus_cycle_reorder(); + } + else if (redraw) { + focus_cycle_reorder(); + } +} + +void focus_cycle_reorder() { - /* 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_valid_target(ifclient, TRUE, - focus_cycle_iconic_windows, - focus_cycle_all_desktops, - focus_cycle_dock_windows, - focus_cycle_desktop_windows)) - { - focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE); - focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); + if (focus_cycle_type == OB_CYCLE_NORMAL) { + focus_cycle_target = focus_cycle_popup_refresh(focus_cycle_target, + TRUE, + focus_cycle_linear); + focus_cycle_update_indicator(focus_cycle_target); + if (!focus_cycle_target) + focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, + TRUE, OB_FOCUS_CYCLE_POPUP_MODE_NONE, + TRUE, TRUE); } } ObClient* focus_cycle(gboolean forward, gboolean all_desktops, + gboolean nonhilite_windows, gboolean dock_windows, gboolean desktop_windows, - gboolean linear, gboolean interactive, - gboolean showbar, ObFocusCyclePopupMode mode, + gboolean linear, gboolean showbar, + ObFocusCyclePopupMode mode, gboolean done, gboolean cancel) { static GList *order = NULL; @@ -77,27 +110,23 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops, ObClient *ft = NULL; ObClient *ret = NULL; - if (interactive) { - if (cancel) { - focus_cycle_target = NULL; - goto done_cycle; - } else if (done) - goto done_cycle; + if (cancel) { + focus_cycle_target = NULL; + goto done_cycle; + } else if (done) + goto done_cycle; - if (!focus_order) - goto done_cycle; + if (!focus_order) + goto done_cycle; - if (linear) list = client_list; - else list = focus_order; - } else { - if (!focus_order) - goto done_cycle; - list = client_list; - } + if (linear) list = client_list; + else list = focus_order; if (focus_cycle_target == NULL) { + focus_cycle_linear = linear; focus_cycle_iconic_windows = TRUE; focus_cycle_all_desktops = all_desktops; + focus_cycle_nonhilite_windows = nonhilite_windows; focus_cycle_dock_windows = dock_windows; focus_cycle_desktop_windows = desktop_windows; start = it = g_list_find(list, focus_client); @@ -117,30 +146,15 @@ ObClient* focus_cycle(gboolean forward, gboolean all_desktops, if (it == NULL) it = g_list_last(list); } ft = it->data; - if (focus_valid_target(ft, TRUE, - focus_cycle_iconic_windows, - focus_cycle_all_desktops, - focus_cycle_dock_windows, - focus_cycle_desktop_windows)) - { - if (interactive) { - if (ft != focus_cycle_target) { /* prevents flicker */ - focus_cycle_target = ft; - focus_cycle_draw_indicator(showbar ? ft : NULL); - } - /* 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) { + if (focus_cycle_valid(ft)) { + if (ft != focus_cycle_target) { /* prevents flicker */ focus_cycle_target = ft; - done = TRUE; - break; + focus_cycle_type = OB_CYCLE_NORMAL; + focus_cycle_draw_indicator(showbar ? ft : NULL); } + /* same arguments as focus_target_valid */ + focus_cycle_popup_show(ft, mode, focus_cycle_linear); + return focus_cycle_target; } } while (it != start); @@ -148,13 +162,12 @@ done_cycle: if (done && !cancel) ret = focus_cycle_target; focus_cycle_target = NULL; + focus_cycle_type = OB_CYCLE_NONE; g_list_free(order); order = NULL; - if (interactive) { - focus_cycle_draw_indicator(NULL); - focus_cycle_popup_hide(); - } + focus_cycle_draw_indicator(NULL); + focus_cycle_popup_hide(); return ret; } @@ -187,8 +200,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, /* the currently selected window isn't interesting */ if (cur == c) continue; - if (!focus_valid_target(it->data, TRUE, FALSE, FALSE, dock_windows, - desktop_windows)) + if (!focus_cycle_valid(it->data)) continue; /* find the centre coords of this window, from the @@ -275,8 +287,10 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows, goto done_cycle; if (focus_cycle_target == NULL) { + focus_cycle_linear = FALSE; focus_cycle_iconic_windows = FALSE; focus_cycle_all_desktops = FALSE; + focus_cycle_nonhilite_windows = TRUE; focus_cycle_dock_windows = dock_windows; focus_cycle_desktop_windows = desktop_windows; } @@ -292,27 +306,22 @@ ObClient* focus_directional_cycle(ObDirection dir, gboolean dock_windows, GList *it; for (it = focus_order; it; it = g_list_next(it)) - if (focus_valid_target(it->data, TRUE, - focus_cycle_iconic_windows, - focus_cycle_all_desktops, - focus_cycle_dock_windows, - focus_cycle_desktop_windows)) + if (focus_cycle_valid(it->data)) { ft = it->data; + break; + } } if (ft && ft != focus_cycle_target) {/* prevents flicker */ focus_cycle_target = ft; + focus_cycle_type = OB_CYCLE_DIRECTIONAL; if (!interactive) goto done_cycle; focus_cycle_draw_indicator(showbar ? ft : NULL); } 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); + focus_cycle_popup_single_show(focus_cycle_target); return focus_cycle_target; done_cycle: @@ -320,9 +329,21 @@ done_cycle: first = NULL; focus_cycle_target = NULL; + focus_cycle_type = OB_CYCLE_NONE; focus_cycle_draw_indicator(NULL); focus_cycle_popup_single_hide(); return ret; } + +gboolean focus_cycle_valid(struct _ObClient *client) +{ + return focus_valid_target(client, screen_desktop, TRUE, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, + focus_cycle_nonhilite_windows, + focus_cycle_dock_windows, + focus_cycle_desktop_windows, + FALSE); +}