X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=c189bc9e5c262dfa435a60ebea83395e990353ab;hb=bb8b9ddbc5c7932f184aeed744f4762b5c95fe28;hp=cf6e7b514aef8be24bff6196ac49051bb7481851;hpb=083f2f5d5d3b5295b824a23b39fcef648b117ef7;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index cf6e7b51..c189bc9e 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,13 +1,14 @@
 #include "event.h"
 #include "openbox.h"
 #include "client.h"
+#include "config.h"
 #include "frame.h"
 #include "screen.h"
+#include "group.h"
 #include "prop.h"
 #include "dispatch.h"
 #include "focus.h"
 #include "parse.h"
-#include "engine.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
@@ -17,44 +18,9 @@ GList **focus_order = NULL; /* these lists are created when screen_startup
                                sets the number of desktops */
 
 Window focus_backup = None;
-gboolean focus_new = TRUE;
-gboolean focus_follow = FALSE;
-static gboolean focus_last = TRUE;
-static gboolean focus_last_on_desktop = TRUE;
 
 static gboolean noreorder = 0;
 
-static void parse_assign(char *name, ParseToken *value)
-{
-    if (!g_ascii_strcasecmp(name, "focusnew")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid value");
-        else {
-            focus_new = value->data.bool;
-        }
-    } else if (!g_ascii_strcasecmp(name, "followmouse")) {
-        if (value->type != TOKEN_BOOL)
-            yyerror("invalid 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);
-}
-
 void focus_startup()
 {
     /* create the window which gets focus when no clients get it. Have to
@@ -63,10 +29,6 @@ void focus_startup()
     XSetWindowAttributes attrib;
 
     focus_client = NULL;
-    focus_new = TRUE;
-    focus_follow = FALSE;
-    focus_last = TRUE;
-    focus_last_on_desktop = TRUE;
 
     attrib.override_redirect = TRUE;
     focus_backup = XCreateWindow(ob_display, ob_root,
@@ -77,8 +39,6 @@ void focus_startup()
 
     /* start with nothing focused */
     focus_set_client(NULL);
-
-    parse_reg_section("focus", NULL, parse_assign);
 }
 
 void focus_shutdown()
@@ -162,7 +122,7 @@ static gboolean focus_under_pointer()
     return FALSE;
 }
 
-void focus_fallback(gboolean switching_desks)
+void focus_fallback(FallbackType type)
 {
     GList *it;
     Client *old = NULL;
@@ -175,26 +135,38 @@ void focus_fallback(gboolean switching_desks)
     */
     focus_set_client(NULL);
 
-    if (switching_desks) {
-        /* don't skip any windows when switching desktops */
-        old = NULL;
+    if (!(type == Fallback_Desktop ?
+          config_focus_last_on_desktop : config_focus_last)) {
+        if (config_focus_follow) focus_under_pointer();
+        return;
     }
 
-    if (!(switching_desks ? focus_last_on_desktop : focus_last)) {
-        if (focus_follow) focus_under_pointer();
-        return;
+    if (type == Fallback_Unfocusing && 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_normal(old->transient_for))
+                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))
+        if (type != Fallback_Unfocusing || it->data != old)
+            if (client_normal(it->data) && 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;
@@ -232,18 +204,18 @@ 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 (client_focus(ft)) {
-                noreorder++; /* avoid reordering the focus_order */
-                break;
-            }
+        if (ft == it->data && focus_client != ft && client_normal(ft) &&
+            client_focus(ft)) {
+            noreorder++; /* avoid reordering the focus_order */
+            return ft;
         }
     } while (it != start);
-    return;
+    return NULL;
 
 done_cycle:
     t = NULL;
     first = NULL;
     g_list_free(order);
     order = NULL;
+    return NULL;
 }