X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus_cycle.c;h=7774076785e43050fcbd61c0172117b7afae9f76;hb=4dec70d627dbf133e3042c09032906ba65ad17b0;hp=46f5f058daff1bf5424973dec9693807ff5708e2;hpb=aa7c36d1bc78529feafb65c2fd6e251a86043d81;p=chaz%2Fopenbox

diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 46f5f058..77740767 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -149,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;
 }
@@ -160,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;
@@ -176,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,10 +198,10 @@ void focus_cycle(gboolean forward, gboolean all_desktops,
         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;
@@ -241,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;
@@ -266,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 */
@@ -274,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))
@@ -293,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
@@ -306,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:
@@ -328,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. */
@@ -337,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;
@@ -372,7 +379,6 @@ void focus_directional_cycle(ObDirection dir, gboolean dock_windows,
         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,6 +386,8 @@ 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;