X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Ffocus.c;h=8afbdcb6f6fc942569679db9e6701d5b03c6f4f4;hb=63b0c5616ffe67aa021234abe6635adb9c91879b;hp=3989404685d08cda2977bbd5beca9ec230467120;hpb=bd12517c615d661fa2823f85bbbcb48555f7c3db;p=chaz%2Fopenbox

diff --git a/openbox/focus.c b/openbox/focus.c
index 39894046..8afbdcb6 100644
--- a/openbox/focus.c
+++ b/openbox/focus.c
@@ -3,10 +3,12 @@
 #include "client.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,7 +19,11 @@ 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;
 
 static void parse_assign(char *name, ParseToken *value)
 {
@@ -33,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);
@@ -47,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,
@@ -78,11 +98,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);
@@ -99,12 +128,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;
@@ -136,10 +163,9 @@ static gboolean focus_under_pointer()
     return FALSE;
 }
 
-void focus_fallback(gboolean switching_desks)
+void focus_fallback(FallbackType type)
 {
     GList *it;
-    gboolean under = FALSE;
     Client *old = NULL;
 
     old = focus_client;
@@ -150,20 +176,86 @@ void focus_fallback(gboolean switching_desks)
     */
     focus_set_client(NULL);
 
-    if (switching_desks) {
-        /* don't skip any windows when switching desktops */
-        old = NULL;
-    } else {
-        if (focus_follow)
-            under = focus_under_pointer();
+    if (!(type == Fallback_Desktop ? focus_last_on_desktop : focus_last)) {
+        if (focus_follow) focus_under_pointer();
+        return;
     }
 
-    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 (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);
+        }
+        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;
 }