X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=bfbc272315e180ed00edf8f3769b771ef6ea22da;hb=e215fc0110de170fb69325b0b79b735ad80529fa;hp=4e231b03f33ff01122ee320eda3d67735ba57d9e;hpb=5d9b0596016f2b72cc8851a20c6e21b331f91a2a;p=chaz%2Fopenbox diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c index 4e231b03..bfbc2723 100644 --- a/openbox/focus_cycle.c +++ b/openbox/focus_cycle.c @@ -32,11 +32,11 @@ #include 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); @@ -52,33 +52,29 @@ 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() +void focus_cycle_stop(ObClient *ifclient) { - if (focus_cycle_target) { + /* 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); } } -static void focus_cycle_destroy_notify(ObClient *client, gpointer data) -{ - /* end cycling if the target disappears. CurrentTime is fine, time won't - be used */ - if (focus_cycle_target == client) - focus_cycle_stop(); -} - /*! 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, @@ -153,8 +149,17 @@ gboolean focus_cycle_target_valid(ObClient *ft, 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; } @@ -164,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; @@ -180,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 { @@ -192,13 +194,14 @@ void focus_cycle(gboolean forward, gboolean all_desktops, if (focus_cycle_target == NULL) { - focus_cycle_all_desktops = FALSE; + focus_cycle_iconic_windows = TRUE; + focus_cycle_all_desktops = all_desktops; focus_cycle_dock_windows = dock_windows; focus_cycle_desktop_windows = desktop_windows; - focus_cycle_target = focus_client; - } + start = it = g_list_find(list, focus_client); + } else + start = it = g_list_find(list, focus_cycle_target); - 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; @@ -212,7 +215,8 @@ 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, + if (focus_cycle_target_valid(ft, + focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows)) @@ -224,7 +228,8 @@ void focus_cycle(gboolean forward, gboolean all_desktops, } if (dialog) /* same arguments as focus_target_valid */ - focus_cycle_popup_show(ft, TRUE, + focus_cycle_popup_show(ft, + focus_cycle_iconic_windows, focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows); @@ -242,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; @@ -267,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 */ @@ -275,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)) @@ -294,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 @@ -307,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: @@ -329,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. */ @@ -338,10 +343,10 @@ 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) + if (best_score == -1 || score < best_score) best_client = cur, best_score = score; } @@ -369,10 +374,10 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, 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; - focus_cycle_target = focus_client; } if (!first) first = focus_client; @@ -380,11 +385,15 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, 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, + 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; @@ -399,7 +408,8 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows, if (focus_cycle_target && dialog) { /* same arguments as focus_target_valid */ focus_cycle_popup_single_show(focus_cycle_target, - FALSE, FALSE, + focus_cycle_iconic_windows, + focus_cycle_all_desktops, focus_cycle_dock_windows, focus_cycle_desktop_windows); return;