X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=e21e8b5ba8233809efd5a0d51c7b18df5c95ec34;hb=8c9b2e8f17d744082eb7f3cd5a4be6e11218ccfa;hp=edd26b69fa4ca4bf1b8a01aadbc3f79531d93df0;hpb=de383f35f792e05259da42263fb8b1dba7d2a3f5;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index edd26b69..e21e8b5b 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -201,6 +201,10 @@ void focus_set_client(ObClient *client)
         active = client ? client->window : None;
         PROP_SET32(RootWindow(ob_display, ob_screen),
                    net_active_window, window, active);
+
+        /* remove hiliting from the window when it gets focused */
+        if (client != NULL)
+            client_hilite(client, FALSE);
     }
 }
 
@@ -391,8 +395,9 @@ void focus_cycle_draw_indicator()
         gint wt, wl, wr, wb;
 
         wt = wl = wr = wb = MAX(3,
-                                ob_rr_theme->handle_height +
-                                ob_rr_theme->bwidth * 2);
+                                MAX(1, MAX(ob_rr_theme->paddingx,
+                                           ob_rr_theme->paddingy)) * 2 +
+                                ob_rr_theme->fbwidth * 2);
 
         x = focus_cycle_target->frame->area.x;
         y = focus_cycle_target->frame->area.y;
@@ -520,7 +525,7 @@ static gboolean valid_focus_target(ObClient *ft)
            ft->type == OB_CLIENT_TYPE_MENU ||
            ft->type == OB_CLIENT_TYPE_UTILITY))) &&
         ((ft->can_focus || ft->focus_notify) &&
-         !ft->skip_taskbar &&
+         !ft->skip_pager &&
          (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)) &&
         ft == client_focus_target(ft))
         return TRUE;