X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=7774076785e43050fcbd61c0172117b7afae9f76;hb=47d63718c664f2ef58f5dfde42ebfc5cc57e123c;hp=56a228387c2621e3cc273efcb9fd72671907d199;hpb=2253b5e341e2a20dee5c0c17eae3f5a8baa1b6ac;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 56a22838..77740767 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -31,9 +31,12 @@ #include #include -ObClient *focus_cycle_target = NULL; +ObClient *focus_cycle_target = NULL; +static gboolean focus_cycle_iconic_windows; +static gboolean focus_cycle_all_desktops; +static gboolean focus_cycle_dock_windows; +static gboolean focus_cycle_desktop_windows; -static void focus_cycle_destroy_notify (ObClient *client, gpointer data); static gboolean focus_target_has_siblings (ObClient *ft, gboolean iconic_windows, gboolean all_desktops); @@ -49,30 +52,27 @@ static ObClient *focus_find_directional (ObClient *c, void focus_cycle_startup(gboolean reconfig) { if (reconfig) return; - - client_add_destroy_notify(focus_cycle_destroy_notify, NULL); } void focus_cycle_shutdown(gboolean reconfig) { if (reconfig) return; - - client_remove_destroy_notify(focus_cycle_destroy_notify); -} - -void focus_cycle_stop() -{ - if (focus_cycle_target) - focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); } -static void focus_cycle_destroy_notify(ObClient *client, gpointer data) +void focus_cycle_stop(ObClient *ifclient) { - /* end cycling if the target disappears. CurrentTime is fine, time won't - be used - */ - if (focus_cycle_target == client) + /* 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)) + { focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); + focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE); + } } /*! Returns if a focus target has valid group siblings that can be cycled @@ -124,7 +124,9 @@ gboolean focus_cycle_target_valid(ObClient *ft, if (dock_windows || desktop_windows) ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) || (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP)); - else + /* 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)) @@ -138,16 +140,26 @@ gboolean focus_cycle_target_valid(ObClient *ft, !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 */ + 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 fous off somewhere else (modal window) */ - ok = ok && ft == client_focus_target(ft); + /* 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; } @@ -157,7 +169,6 @@ void focus_cycle(gboolean forward, gboolean all_desktops, gboolean linear, gboolean interactive, gboolean dialog, gboolean done, gboolean cancel) { - static ObClient *first = NULL; static ObClient *t = NULL; static GList *order = NULL; GList *it, *start, *list; @@ -173,8 +184,6 @@ void focus_cycle(gboolean forward, gboolean all_desktops, if (!focus_order) goto done_cycle; - if (!first) first = focus_client; - if (linear) list = client_list; else list = focus_order; } else { @@ -182,9 +191,17 @@ void focus_cycle(gboolean forward, gboolean all_desktops, goto done_cycle; list = client_list; } - if (!focus_cycle_target) focus_cycle_target = focus_client; - start = it = g_list_find(list, focus_cycle_target); + + if (focus_cycle_target == NULL) { + focus_cycle_iconic_windows = TRUE; + focus_cycle_all_desktops = all_desktops; + focus_cycle_dock_windows = dock_windows; + focus_cycle_desktop_windows = desktop_windows; + start = it = g_list_find(list, focus_client); + } else + start = it = g_list_find(list, focus_cycle_target); + if (!start) /* switched desktops or something? */ start = it = forward ? g_list_last(list) : g_list_first(list); if (!start) goto done_cycle; @@ -198,9 +215,11 @@ 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, TRUE, - all_desktops, dock_windows, - desktop_windows)) + if (focus_cycle_target_valid(ft, + 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 */ @@ -209,9 +228,11 @@ void focus_cycle(gboolean forward, gboolean all_desktops, } if (dialog) /* same arguments as focus_target_valid */ - focus_cycle_popup_show(ft, TRUE, - all_desktops, dock_windows, - desktop_windows); + focus_cycle_popup_show(ft, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, + focus_cycle_dock_windows, + focus_cycle_desktop_windows); return; } else if (ft != focus_cycle_target) { focus_cycle_target = ft; @@ -226,7 +247,6 @@ done_cycle: client_activate(focus_cycle_target, FALSE, TRUE); t = NULL; - first = NULL; focus_cycle_target = NULL; g_list_free(order); order = NULL; @@ -251,7 +271,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, ObClient *best_client, *cur; GList *it; - if(!client_list) + if (!client_list) return NULL; /* first, find the centre coords of the currently focused window */ @@ -259,13 +279,13 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, my_cy = c->frame->area.y + c->frame->area.height / 2; best_score = -1; - best_client = NULL; + best_client = c; - for(it = g_list_first(client_list); it; it = g_list_next(it)) { + for (it = g_list_first(client_list); it; it = g_list_next(it)) { cur = it->data; /* the currently selected window isn't interesting */ - if(cur == c) + if (cur == c) continue; if (!focus_cycle_target_valid(it->data, FALSE, FALSE, dock_windows, desktop_windows)) @@ -278,8 +298,9 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, his_cy = (cur->frame->area.y - my_cy) + cur->frame->area.height / 2; - if(dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST || - dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) { + if (dir == OB_DIRECTION_NORTHEAST || dir == OB_DIRECTION_SOUTHEAST || + dir == OB_DIRECTION_SOUTHWEST || dir == OB_DIRECTION_NORTHWEST) + { gint tx; /* Rotate the diagonals 45 degrees counterclockwise. * To do this, multiply the matrix /+h +h\ with the @@ -291,7 +312,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, his_cx = tx; } - switch(dir) { + switch (dir) { case OB_DIRECTION_NORTH: case OB_DIRECTION_SOUTH: case OB_DIRECTION_NORTHEAST: @@ -313,7 +334,7 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, } /* the target must be in the requested direction */ - if(distance <= 0) + if (distance <= 0) continue; /* Calculate score for this window. The smaller the better. */ @@ -322,12 +343,13 @@ static ObClient *focus_find_directional(ObClient *c, ObDirection dir, /* windows more than 45 degrees off the direction are * heavily penalized and will only be chosen if nothing * else within a million pixels */ - if(offset > distance) + if (offset > distance) score += 1000000; - if(best_score == -1 || score < best_score) - best_client = cur, - best_score = score; + if (best_score == -1 || score < best_score) { + best_client = cur; + best_score = score; + } } return best_client; @@ -352,18 +374,29 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, if (!focus_order) goto done_cycle; + if (focus_cycle_target == NULL) { + focus_cycle_iconic_windows = FALSE; + focus_cycle_all_desktops = FALSE; + focus_cycle_dock_windows = dock_windows; + focus_cycle_desktop_windows = desktop_windows; + } + if (!first) first = focus_client; - if (!focus_cycle_target) focus_cycle_target = focus_client; if (focus_cycle_target) ft = focus_find_directional(focus_cycle_target, dir, dock_windows, desktop_windows); + else if (first) + ft = focus_find_directional(first, dir, dock_windows, desktop_windows); else { GList *it; for (it = focus_order; it; it = g_list_next(it)) - if (focus_cycle_target_valid(it->data, FALSE, FALSE, dock_windows, - desktop_windows)) + if (focus_cycle_target_valid(it->data, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, + focus_cycle_dock_windows, + focus_cycle_desktop_windows)) ft = it->data; } @@ -375,8 +408,11 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, } if (focus_cycle_target && dialog) { /* same arguments as focus_target_valid */ - focus_cycle_popup_show(focus_cycle_target, FALSE, FALSE, dock_windows, - desktop_windows); + 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; } @@ -388,23 +424,7 @@ done_cycle: focus_cycle_target = NULL; focus_cycle_draw_indicator(NULL); - focus_cycle_popup_hide(); + focus_cycle_popup_single_hide(); return; } - -void focus_order_add_new(ObClient *c) -{ - if (c->iconic) - focus_order_to_top(c); - else { - g_assert(!g_list_find(focus_order, c)); - /* if there are any iconic windows, put this above them in the order, - but if there are not, then put it under the currently focused one */ - if (focus_order && ((ObClient*)focus_order->data)->iconic) - focus_order = g_list_insert(focus_order, c, 0); - else - focus_order = g_list_insert(focus_order, c, 1); - } -} -