X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=b1e312361152c733712a9d6d6dfa816e2bb962e5;hb=b5161f803267be7778dd893de55d2f71c808d719;hp=aac6675e3a1fc7ccf18aaf0b64ce27bb822116cd;hpb=0da9aa2660b51ce6208b041cc6e14f15e522c289;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index aac6675e..b1e31236 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -318,10 +318,10 @@ static void popup_cycle(ObClient *c, gboolean show)
                                 (p->iconic ? p->icon_title : p->title),
                                 NULL);
             */
-        icon_popup_delay_show(focus_cycle_popup, G_USEC_PER_SEC/12,
-                              (title ? title :
-                               (c->iconic ? c->icon_title : c->title)),
-                              client_icon(p, 48, 48));
+        icon_popup_show(focus_cycle_popup,
+                        (title ? title :
+                         (c->iconic ? c->icon_title : c->title)),
+                        client_icon(p, 48, 48));
         g_free(title);
     }
 }
@@ -475,12 +475,13 @@ static gboolean valid_focus_target(ObClient *ft, gboolean dock_windows)
     else
         ok = (ft->type == OB_CLIENT_TYPE_NORMAL ||
               ft->type == OB_CLIENT_TYPE_DIALOG ||
-              (!client_has_group_siblings(ft) &&
+              (!client_has_application_group_siblings(ft) &&
                (ft->type == OB_CLIENT_TYPE_TOOLBAR ||
                 ft->type == OB_CLIENT_TYPE_MENU ||
                 ft->type == OB_CLIENT_TYPE_UTILITY)));
     ok = ok && (ft->can_focus || ft->focus_notify);
-    ok = ok && !ft->skip_pager;
+    if (!dock_windows) /* use dock windows that skip taskbar too */
+        ok = ok && !ft->skip_taskbar;
     ok = ok && (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL);
     ok = ok && ft == client_focus_target(ft);
     return ok;