break focus. or maybe make it better.

[chaz/openbox] / openbox / focus.c

diff --git a/openbox/focus.c b/openbox/focus.c
index 0f80a58bfbd975e5b0734a7f7b64c799fe6ae046..2582736bb59ac24ae485622dbc4ef05422410d64 100644 (file)
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -73,7 +73,7 @@ void focus_set_client(ObClient *client)
     screen_install_colormap(focus_client, FALSE);
     screen_install_colormap(client, TRUE);
 
-    if (client == NULL) {
+    if (!client) {
        /* when nothing will be focused, send focus to the backup target */
        XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
                        event_lasttime);
@@ -87,16 +87,22 @@ void focus_set_client(ObClient *client)
     old = focus_client;
     focus_client = client;
 
-    /* move to the top of the list */
-    if (client != NULL)
-        push_to_top(client);
+    if (old) {
+        /* focus state can affect the stacking layer */
+        client_calc_layer(old);
+    }
+    if (client) {
+        /* focus state can affect the stacking layer */
+        client_calc_layer(client);
 
-    /* set the NET_ACTIVE_WINDOW hint, but preserve it on shutdown */
-    if (ob_state() != OB_STATE_EXITING) {
-        active = client ? client->window : None;
-        PROP_SET32(RootWindow(ob_display, ob_screen),
-                   net_active_window, window, active);
+        /* move to the top of the list */
+        push_to_top(client);
     }
+
+    /* set the NET_ACTIVE_WINDOW hint */
+    active = client ? client->window : None;
+    PROP_SET32(RootWindow(ob_display, ob_screen),
+               net_active_window, window, active);
 }
 
 static gboolean focus_under_pointer()
@@ -162,11 +168,8 @@ void focus_fallback(ObFocusFallbackType type)
     */
     focus_set_client(NULL);
 
-    if (!(type == OB_FOCUS_FALLBACK_DESKTOP ?
-          config_focus_last_on_desktop : config_focus_last)) {
-        if (config_focus_follow) focus_under_pointer();
+    if (config_focus_follow && focus_under_pointer())
         return;
-    }
 
     if (type == OB_FOCUS_FALLBACK_UNFOCUSING && old) {
         /* try for transient relations */
@@ -260,6 +263,18 @@ static void popup_cycle(ObClient *c, gboolean show)
     }
 }
 
+static gboolean valid_focus_target(ObClient *ft)
+{
+    /* we don't use client_can_focus here, because that doesn't let you
+       focus an iconic window, but we want to be able to, so we just check
+       if the focus flags on the window allow it, and its on the current
+       desktop */
+    return (ft->transients == NULL && client_normal(ft) &&
+            ((ft->can_focus || ft->focus_notify) &&
+             !ft->skip_taskbar &&
+             (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)));
+}
+
 void focus_cycle(gboolean forward, gboolean linear,
                  gboolean dialog, gboolean done, gboolean cancel)
 {
@@ -283,9 +298,8 @@ void focus_cycle(gboolean forward, gboolean linear,
     if (!focus_order[screen_desktop])
         goto done_cycle;
 
-    if (!first) first = focus_order[screen_desktop]->data;
-    if (!focus_cycle_target) focus_cycle_target =
-                                 focus_order[screen_desktop]->data;
+    if (!first) first = focus_client;
+    if (!focus_cycle_target) focus_cycle_target = focus_client;
 
     if (linear) list = client_list;
     else        list = focus_order[screen_desktop];
@@ -305,14 +319,7 @@ void focus_cycle(gboolean forward, gboolean linear,
         }
         /*ft = client_focus_target(it->data);*/
         ft = it->data;
-        /* we don't use client_can_focus here, because that doesn't let you
-           focus an iconic window, but we want to be able to, so we just check
-           if the focus flags on the window allow it, and its on the current
-           desktop */
-        if (ft->transients == NULL && client_normal(ft) &&
-            ((ft->can_focus || ft->focus_notify) &&
-             !ft->skip_taskbar &&
-             (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL))) {
+        if (valid_focus_target(ft)) {
             if (ft != focus_cycle_target) { /* prevents flicker */
                 if (focus_cycle_target)
                     frame_adjust_focus(focus_cycle_target->frame, FALSE);
@@ -343,7 +350,7 @@ void focus_directional_cycle(ObDirection dir,
                              gboolean dialog, gboolean done, gboolean cancel)
 {
     static ObClient *first = NULL;
-    ObClient *ft;
+    ObClient *ft = NULL;
 
     if (cancel) {
         if (focus_cycle_target)
@@ -359,11 +366,20 @@ void focus_directional_cycle(ObDirection dir,
     if (!focus_order[screen_desktop])
         goto done_cycle;
 
-    if (!first) first = focus_order[screen_desktop]->data;
-    if (!focus_cycle_target) focus_cycle_target =
-                                 focus_order[screen_desktop]->data;
+    if (!first) first = focus_client;
+    if (!focus_cycle_target) focus_cycle_target = focus_client;
+
+    if (focus_cycle_target)
+        ft = client_find_directional(focus_cycle_target, dir);
+    else {
+        GList *it;
 
-    if ((ft = client_find_directional(focus_cycle_target, dir))) {
+        for (it = focus_order[screen_desktop]; it; it = g_list_next(it))
+            if (valid_focus_target(it->data))
+                ft = it->data;
+    }
+        
+    if (ft) {
         if (ft != focus_cycle_target) {/* prevents flicker */
             if (focus_cycle_target)
                 frame_adjust_focus(focus_cycle_target->frame, FALSE);
@@ -371,9 +387,9 @@ void focus_directional_cycle(ObDirection dir,
             frame_adjust_focus(focus_cycle_target->frame, TRUE);
         }
         popup_cycle(ft, dialog);
+        if (dialog)
+            return;
     }
-    if (dialog)
-        return;
 
 done_cycle:
     if (done && focus_cycle_target)