X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Ffocus.c;h=d0886a50f7cccda5951dc91c3aba2f6472abefd6;hb=40bfb2b6e5249608f6f7d0c8012ca44f67883843;hp=058ad9beab5ad8653f5ffc25f3cff09b05f4078d;hpb=79ddf91839689e6a581aef95bd926df562d54c29;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 058ad9be..d0886a50 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -3,6 +3,7 @@
 #include "client.h"
 #include "frame.h"
 #include "screen.h"
+#include "group.h"
 #include "prop.h"
 #include "dispatch.h"
 #include "focus.h"
@@ -18,7 +19,9 @@ GList **focus_order = NULL; /* these lists are created when screen_startup
 
 Window focus_backup = None;
 gboolean focus_new = TRUE;
-gboolean focus_follow = TRUE;
+gboolean focus_follow = FALSE;
+static gboolean focus_last = TRUE;
+static gboolean focus_last_on_desktop = TRUE;
 
 static gboolean noreorder = 0;
 
@@ -36,6 +39,18 @@ static void parse_assign(char *name, ParseToken *value)
         else {
             focus_follow = value->data.bool;
         }
+    } else if (!g_ascii_strcasecmp(name, "focuslast")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            focus_last = value->data.bool;
+        }
+    } else if (!g_ascii_strcasecmp(name, "focuslastondesktop")) {
+        if (value->type != TOKEN_BOOL)
+            yyerror("invalid value");
+        else {
+            focus_last_on_desktop = value->data.bool;
+        }
     } else
         yyerror("invalid option");
     parse_free_token(value);
@@ -50,7 +65,9 @@ void focus_startup()
 
     focus_client = NULL;
     focus_new = TRUE;
-    focus_follow = TRUE;
+    focus_follow = FALSE;
+    focus_last = TRUE;
+    focus_last_on_desktop = TRUE;
 
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
@@ -149,7 +166,6 @@ static gboolean focus_under_pointer()
 void focus_fallback(gboolean switching_desks)
 {
     GList *it;
-    gboolean under = FALSE;
     Client *old = NULL;
 
     old = focus_client;
@@ -163,22 +179,38 @@ void focus_fallback(gboolean switching_desks)
     if (switching_desks) {
         /* don't skip any windows when switching desktops */
         old = NULL;
-    } else {
-        if (focus_follow)
-            under = focus_under_pointer();
     }
 
-    if (!under) {
-        for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
-            if (it->data != old && client_normal(it->data))
-                if (client_focus(it->data))
-                    break;
-        if (it == NULL) /* nothing to focus */
-            focus_set_client(NULL);
+    if (!(switching_desks ? focus_last_on_desktop : focus_last)) {
+        if (focus_follow) focus_under_pointer();
+        return;
+    }
+
+    if (old && old->transient_for) {
+        if (old->transient_for == TRAN_GROUP) {
+            for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
+                GSList *sit;
+
+                for (sit = old->group->members; sit; sit = sit->next)
+                    if (sit->data == it->data && client_focus(sit->data))
+                        return;
+            }
+        } else {
+            if (client_focus(old->transient_for))
+                return;
+        }
     }
+
+    for (it = focus_order[screen_desktop]; it != NULL; it = it->next)
+        if (it->data != old && client_normal(it->data))
+            if (client_focus(it->data))
+                return;
+
+    /* nothing to focus */
+    focus_set_client(NULL);
 }
 
-void focus_cycle(gboolean forward, gboolean linear, gboolean done,
+Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
                  gboolean cancel)
 {
     static Client *first = NULL;
@@ -203,7 +235,9 @@ void focus_cycle(gboolean forward, gboolean linear, gboolean done,
     else        list = focus_order[screen_desktop];
 
     start = it = g_list_find(list, focus_client);
-    if (!start) goto done_cycle; /* switched desktops or something? */
+    if (!start) /* switched desktops or something? */
+        start = it = forward ? g_list_last(list) : g_list_first(list);
+    if (!start) goto done_cycle;
 
     do {
         if (forward) {
@@ -214,18 +248,20 @@ void focus_cycle(gboolean forward, gboolean linear, gboolean done,
             if (it == NULL) it = g_list_last(list);
         }
         ft = client_focus_target(it->data);
-        if (ft == it->data && focus_client != ft && client_focusable(ft)) {
+        if (ft == it->data && focus_client != ft && client_normal(ft) &&
+            client_focusable(ft)) {
             if (client_focus(ft)) {
                 noreorder++; /* avoid reordering the focus_order */
-                break;
+                return ft;
             }
         }
     } while (it != start);
-    return;
+    return NULL;
 
 done_cycle:
     t = NULL;
     first = NULL;
     g_list_free(order);
     order = NULL;
+    return NULL;
 }