X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=cf65ff25a9b16cbeb8c6a87a09a060b292dbd67f;hb=857245960e4a35f9307f1b6124a4b7b4e726298b;hp=823435c9df69d85c97e942f42c7060044726f30d;hpb=a56d3a12abbe51e9ca5ca81e3fe2fc73028d6cba;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 823435c9..cf65ff25 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -37,6 +37,8 @@
 #include <glib.h>
 #include <assert.h>
 
+#define FOCUS_INDICATOR_WIDTH 5
+
 ObClient *focus_client = NULL;
 GList *focus_order = NULL;
 ObClient *focus_cycle_target = NULL;
@@ -232,24 +234,19 @@ ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
             ObClient *c = it->data;
             /* fallback focus to a window if:
                1. it is actually focusable, cuz if it's not then we're sending
-               focus off to nothing
-               2. it is validated. if the window is about to disappear, then
-               don't try focus it.
-               3. it is visible on the current desktop. this ignores
-               omnipresent windows, which are problematic in their own rite.
-               4. it's not iconic
-               5. it is a normal type window, don't fall back onto a dock or
+               focus off to nothing. this includes if it is visible right now
+               2. it is on the current desktop. this ignores omnipresent
+               windows, which are problematic in their own rite.
+               3. it is a normal type window, don't fall back onto a dock or
                a splashscreen or a desktop window (save the desktop as a
                backup fallback though)
             */
-            if (client_can_focus(c) && !c->iconic)
+            if (client_can_focus(c))
             {
                 if (c->desktop == screen_desktop && client_normal(c)) {
                     ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
                     return it->data;
-                } else if ((c->desktop == screen_desktop ||
-                            c->desktop == DESKTOP_ALL) &&
-                           c->type == OB_CLIENT_TYPE_DESKTOP && 
+                } else if (c->type == OB_CLIENT_TYPE_DESKTOP && 
                            desktop == NULL)
                     desktop = c;
             }
@@ -345,10 +342,7 @@ void focus_cycle_draw_indicator()
         gint x, y, w, h;
         gint wt, wl, wr, wb;
 
-        wt = wl = wr = wb = MAX(3,
-                                MAX(1, MAX(ob_rr_theme->paddingx,
-                                           ob_rr_theme->paddingy)) * 2 +
-                                ob_rr_theme->fbwidth * 2);
+        wt = wl = wr = wb = FOCUS_INDICATOR_WIDTH;
 
         x = focus_cycle_target->frame->area.x;
         y = focus_cycle_target->frame->area.y;
@@ -499,7 +493,7 @@ static gboolean valid_focus_target(ObClient *ft, gboolean dock_windows)
         for (it = ft->transients; it; it = g_slist_next(it)) {
             ObClient *c = it->data;
 
-            if (c->frame->visible)
+            if (frame_visible(c->frame))
                 return FALSE;
         }
         return TRUE;