X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=e5d3942f165260a7a6372823b973dca13cd0002a;hb=79a352a40bd16924b1ca3df49f6c82d77e956a0e;hp=5c5130f6958a3f1d584ae2f4c3db85f0fe435aed;hpb=96a81e8837ae71f5bffe4f2c7c427d2402078393;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 5c5130f6..e5d3942f 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -1,12 +1,15 @@
 #include "event.h"
-#include "config.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 "stacking.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
@@ -17,6 +20,8 @@ GList **focus_order = NULL; /* these lists are created when screen_startup
 
 Window focus_backup = None;
 
+static gboolean noreorder = 0;
+
 void focus_startup()
 {
     /* create the window which gets focus when no clients get it. Have to
@@ -31,7 +36,8 @@ void focus_startup()
 				 -100, -100, 1, 1, 0,
                                  CopyFromParent, InputOutput, CopyFromParent,
                                  CWOverrideRedirect, &attrib);
-    XMapRaised(ob_display, focus_backup);
+    XMapWindow(ob_display, focus_backup);
+    stacking_raise_internal(focus_backup);
 
     /* start with nothing focused */
     focus_set_client(NULL);
@@ -53,11 +59,20 @@ void focus_shutdown()
                    event_lasttime);
 }
 
+static void push_to_top(Client *client)
+{
+    guint desktop;
+
+    desktop = client->desktop;
+    if (desktop == DESKTOP_ALL) desktop = screen_desktop;
+    focus_order[desktop] = g_list_remove(focus_order[desktop], client);
+    focus_order[desktop] = g_list_prepend(focus_order[desktop], client);
+}
+
 void focus_set_client(Client *client)
 {
     Window active;
     Client *old;
-    guint desktop;
 
     /* uninstall the old colormap, and install the new one */
     screen_install_colormap(focus_client, FALSE);
@@ -74,12 +89,10 @@ void focus_set_client(Client *client)
     focus_client = client;
 
     /* move to the top of the list */
-    if (client != NULL) {
-        desktop = client->desktop;
-        if (desktop == DESKTOP_ALL) desktop = screen_desktop;
-        focus_order[desktop] = g_list_remove(focus_order[desktop], client);
-        focus_order[desktop] = g_list_prepend(focus_order[desktop], client);
-    }
+    if (noreorder)
+        --noreorder;
+    else if (client != NULL)
+        push_to_top(client);
 
     /* set the NET_ACTIVE_WINDOW hint */
     active = client ? client->window : None;
@@ -111,39 +124,100 @@ static gboolean focus_under_pointer()
     return FALSE;
 }
 
-void focus_fallback(gboolean switching_desks)
+void focus_fallback(FallbackType type)
 {
-    ConfigValue focus_follow;
     GList *it;
-    gboolean under = FALSE;
     Client *old = NULL;
 
-    if (switching_desks) {
-        /* don't skip any windows when switching desktops */
-        old = focus_client;
-        focus_client = NULL;
-    } else {
-        if (!config_get("focusFollowsMouse", Config_Bool, &focus_follow))
-            g_assert_not_reached();
-        if (focus_follow.bool)
-            under = focus_under_pointer();
+    old = focus_client;
+
+    /* unfocus any focused clients.. they can be focused by Pointer events
+       and such, and then when I try focus them, I won't get a FocusIn event
+       at all for them.
+    */
+    focus_set_client(NULL);
+
+    if (!(type == Fallback_Desktop ?
+          config_focus_last_on_desktop : config_focus_last)) {
+        if (config_focus_follow) focus_under_pointer();
+        return;
     }
 
-    if (!under) {
-        for (it = focus_order[screen_desktop]; it != NULL; it = it->next) {
-            g_message("fallback trying 0x%lx", ((Client*)it->data)->window);
-            if (it->data != focus_client && client_normal(it->data)) {
-                /* if we're switching desktops, and we get the already focused
-                   window, then we wont get a FocusIn for it, so just restore
-                   the focus_client so that we know it is focused */
-                if (it->data == old) {
-                    focus_client = old;
-                    break;
-                } else if (client_focus(it->data))
-                    break;
+    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 (type != Fallback_Unfocusing || it->data != old)
+            if (client_normal(it->data) && client_focus(it->data))
+                return;
+
+    /* nothing to focus */
+    focus_set_client(NULL);
+}
+
+Client *focus_cycle(gboolean forward, gboolean linear, gboolean done,
+                 gboolean cancel)
+{
+    static Client *first = NULL;
+    static Client *t = NULL;
+    static GList *order = NULL;
+    GList *it, *start, *list;
+    Client *ft;
+
+    if (cancel) {
+        if (first) client_focus(first);
+        goto done_cycle;
+    } else if (done) {
+        if (focus_client) {
+            push_to_top(focus_client); /* move to top of focus_order */
+            stacking_raise(focus_client);
         }
-        if (it == NULL) /* nothing to focus */
-            focus_set_client(NULL);
+        goto done_cycle;
     }
+    if (!first) first = focus_client;
+
+    if (linear) list = client_list;
+    else        list = focus_order[screen_desktop];
+
+    start = it = g_list_find(list, focus_client);
+    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) {
+            it = it->next;
+            if (it == NULL) it = list;
+        } else {
+            it = it->prev;
+            if (it == NULL) it = g_list_last(list);
+        }
+        ft = client_focus_target(it->data);
+        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 NULL;
+
+done_cycle:
+    t = NULL;
+    first = NULL;
+    g_list_free(order);
+    order = NULL;
+    return NULL;
 }