The colormap is being set twice when moving focus to the root window
[mikachu/openbox.git] / openbox / focus.c
index 817640f..a0e9c66 100644 (file)
 #include "event.h"
 #include "openbox.h"
 #include "grab.h"
-#include "framerender.h"
 #include "client.h"
 #include "config.h"
-#include "frame.h"
-#include "screen.h"
 #include "group.h"
+#include "focus_cycle.h"
+#include "screen.h"
 #include "prop.h"
+#include "keyboard.h"
 #include "focus.h"
 #include "stacking.h"
-#include "popup.h"
-#include "render/render.h"
 
 #include <X11/Xlib.h>
 #include <glib.h>
-#include <assert.h>
-
-ObClient *focus_client, *focus_hilite;
-GList *focus_order;
-ObClient *focus_cycle_target;
-
-struct {
-    InternalWindow top;
-    InternalWindow left;
-    InternalWindow right;
-    InternalWindow bottom;
-} focus_indicator;
 
-RrAppearance *a_focus_indicator;
-RrColor *color_white;
-
-static ObIconPopup *focus_cycle_popup;
-
-static void focus_cycle_destructor(ObClient *client, gpointer data)
-{
-    /* end cycling if the target disappears. CurrentTime is fine, time won't
-       be used
-    */
-    if (focus_cycle_target == client)
-        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, CurrentTime);
-}
+#define FOCUS_INDICATOR_WIDTH 6
 
-static Window createWindow(Window parent, gulong mask,
-                           XSetWindowAttributes *attrib)
-{
-    return XCreateWindow(ob_display, parent, 0, 0, 1, 1, 0,
-                         RrDepth(ob_rr_inst), InputOutput,
-                         RrVisual(ob_rr_inst), mask, attrib);
-                       
-}
+ObClient *focus_client = NULL;
+GList *focus_order = NULL;
 
 void focus_startup(gboolean reconfig)
 {
-    focus_cycle_popup = icon_popup_new(TRUE);
-
-    if (!reconfig) {
-        XSetWindowAttributes attr;
-
-        client_add_destructor(focus_cycle_destructor, NULL);
-
-        /* start with nothing focused */
-        focus_set_client(NULL);
-
-        focus_indicator.top.obwin.type = Window_Internal;
-        focus_indicator.left.obwin.type = Window_Internal;
-        focus_indicator.right.obwin.type = Window_Internal;
-        focus_indicator.bottom.obwin.type = Window_Internal;
-
-        attr.override_redirect = True;
-        attr.background_pixel = BlackPixel(ob_display, ob_screen);
-        focus_indicator.top.win =
-            createWindow(RootWindow(ob_display, ob_screen),
-                         CWOverrideRedirect | CWBackPixel, &attr);
-        focus_indicator.left.win =
-            createWindow(RootWindow(ob_display, ob_screen),
-                         CWOverrideRedirect | CWBackPixel, &attr);
-        focus_indicator.right.win =
-            createWindow(RootWindow(ob_display, ob_screen),
-                         CWOverrideRedirect | CWBackPixel, &attr);
-        focus_indicator.bottom.win =
-            createWindow(RootWindow(ob_display, ob_screen),
-                         CWOverrideRedirect | CWBackPixel, &attr);
-
-        stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.top));
-        stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.left));
-        stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.right));
-        stacking_add(INTERNAL_AS_WINDOW(&focus_indicator.bottom));
-
-        color_white = RrColorNew(ob_rr_inst, 0xff, 0xff, 0xff);
-
-        a_focus_indicator = RrAppearanceNew(ob_rr_inst, 4);
-        a_focus_indicator->surface.grad = RR_SURFACE_SOLID;
-        a_focus_indicator->surface.relief = RR_RELIEF_FLAT;
-        a_focus_indicator->surface.primary = RrColorNew(ob_rr_inst,
-                                                        0, 0, 0);
-        a_focus_indicator->texture[0].type = RR_TEXTURE_LINE_ART;
-        a_focus_indicator->texture[0].data.lineart.color = color_white;
-        a_focus_indicator->texture[1].type = RR_TEXTURE_LINE_ART;
-        a_focus_indicator->texture[1].data.lineart.color = color_white;
-        a_focus_indicator->texture[2].type = RR_TEXTURE_LINE_ART;
-        a_focus_indicator->texture[2].data.lineart.color = color_white;
-        a_focus_indicator->texture[3].type = RR_TEXTURE_LINE_ART;
-        a_focus_indicator->texture[3].data.lineart.color = color_white;
-    }
+    if (reconfig) return;
+
+    /* start with nothing focused */
+    focus_nothing();
 }
 
 void focus_shutdown(gboolean reconfig)
 {
-    icon_popup_free(focus_cycle_popup);
-
-    if (!reconfig) {
-        client_remove_destructor(focus_cycle_destructor);
-
-        /* reset focus to root */
-        XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
+    if (reconfig) return;
 
-        RrColorFree(color_white);
-
-        RrAppearanceFree(a_focus_indicator);
-
-        XDestroyWindow(ob_display, focus_indicator.top.win);
-        XDestroyWindow(ob_display, focus_indicator.left.win);
-        XDestroyWindow(ob_display, focus_indicator.right.win);
-        XDestroyWindow(ob_display, focus_indicator.bottom.win);
-    }
+    /* reset focus to root */
+    XSetInputFocus(ob_display, PointerRoot, RevertToNone, CurrentTime);
 }
 
 static void push_to_top(ObClient *client)
 {
+    ObClient *p;
+
+    /* if it is modal for a single window, then put that window at the top
+       of the focus order first, so it will be right after ours. the same is
+       done with stacking */
+    if (client->modal && (p = client_direct_parent(client)))
+        push_to_top(p);
+
     focus_order = g_list_remove(focus_order, client);
     focus_order = g_list_prepend(focus_order, client);
 }
@@ -156,480 +72,124 @@ static void push_to_top(ObClient *client)
 void focus_set_client(ObClient *client)
 {
     Window active;
-    ObClient *old;
 
-#ifdef DEBUG_FOCUS
-    ob_debug("focus_set_client 0x%lx\n", client ? client->window : 0);
-#endif
+    ob_debug_type(OB_DEBUG_FOCUS,
+                  "focus_set_client 0x%lx\n", client ? client->window : 0);
+
+    if (focus_client == client)
+        return;
 
     /* uninstall the old colormap, and install the new one */
     screen_install_colormap(focus_client, FALSE);
     screen_install_colormap(client, TRUE);
 
-    if (client == NULL) {
-#ifdef DEBUG_FOCUS
-        ob_debug("actively focusing NONWINDOW\n");
-#endif
-        /* when nothing will be focused, send focus to the backup target */
-        XSetInputFocus(ob_display, screen_support_win, RevertToNone,
-                       event_curtime);
-        XSync(ob_display, FALSE);
-    }
-
-    /* in the middle of cycling..? kill it. CurrentTime is fine, time won't
-       be used.
-    */
-    if (focus_cycle_target)
-        focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, CurrentTime);
-
-    old = focus_client;
     focus_client = client;
 
-    /* move to the top of the list */
-    if (client != NULL)
+    if (client != NULL) {
+        /* move to the top of the list */
         push_to_top(client);
+        /* remove hiliting from the window when it gets focused */
+        client_hilite(client, FALSE);
+    }
 
     /* 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);
-
-        /* remove hiliting from the window when it gets focused */
-        if (client != NULL)
-            client_hilite(client, FALSE);
     }
 }
 
-ObClient* focus_fallback_target(gboolean allow_refocus, ObClient *old)
+static ObClient* focus_fallback_target(gboolean allow_refocus,
+                                       gboolean allow_pointer,
+                                       gboolean allow_omnipresent,
+                                       ObClient *old)
 {
     GList *it;
-    ObClient *target = NULL;
-    ObClient *desktop = NULL;
-
-    ob_debug("trying pointer stuff\n");
-    if (config_focus_follow && !config_focus_last)
-    {
-        if ((target = client_under_pointer()))
-            if (allow_refocus || target != old)
-                if (client_normal(target) && client_can_focus(target) &&
-                    client_validate(target)) {
-                    ob_debug("found in pointer stuff\n");
-                    return target;
-                }
-    }
-
-#if 0
-        /* try for group relations */
-        if (old->group) {
-            GSList *sit;
-
-            for (it = focus_order[screen_desktop]; it; it = g_list_next(it))
-                for (sit = old->group->members; sit; sit = g_slist_next(sit))
-                    if (sit->data == it->data)
-                        if (sit->data != old && client_normal(sit->data))
-                            if (client_can_focus(sit->data))
-                                return sit->data;
-        }
-#endif
-
-    ob_debug("trying omnipresentness\n");
-    if (old && old->desktop == DESKTOP_ALL)
-        return old;
-
-
-    ob_debug("trying  the focus order\n");
-    for (it = focus_order; it; it = g_list_next(it))
-        if (allow_refocus || it->data != old) {
-            ObClient *c = it->data;
-            /* fallback focus to a window if:
-               1. it is actually focusable, cuz if it's not then we're sending
-               focus off to nothing
-               2. it is validated. if the window is about to disappear, then
-               don't try focus it.
-               3. it is visible on the current desktop. this ignores
-               omnipresent windows, which are problematic in their own rite.
-               4. it's not iconic
-               5. it is a normal type window, don't fall back onto a dock or
-               a splashscreen or a desktop window (save the desktop as a
-               backup fallback though)
-            */
-            if (client_can_focus(c) && client_validate(c) &&
-                c->desktop == screen_desktop && !c->iconic)
-            {
-                if (client_normal(c)) {
-                    ob_debug("found in focus order\n");
-                    return it->data;
-                } else if (c->type == OB_CLIENT_TYPE_DESKTOP && !desktop)
-                    desktop = c;
-            }
+    ObClient *c;
+
+    ob_debug_type(OB_DEBUG_FOCUS, "trying pointer stuff\n");
+    if (allow_pointer && config_focus_follow)
+        if ((c = client_under_pointer()) &&
+            (allow_refocus || client_focus_target(c) != old) &&
+            (client_normal(c) &&
+             client_focus(c)))
+        {
+            ob_debug_type(OB_DEBUG_FOCUS, "found in pointer stuff\n");
+            return c;
         }
 
-    /* as a last resort fallback to the desktop window if there is one.
-       (if there's more than one, then the one most recently focused.)
-    */
-    return desktop;   
-}
-
-void focus_fallback(gboolean allow_refocus)
-{
-    ObClient *new;
-    ObClient *old;
-
-    /* save this before moving focus away to nothing */
-    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 ((new = focus_fallback_target(allow_refocus, old)))
-        client_focus(new);
-}
-
-static void popup_cycle(ObClient *c, gboolean show)
-{
-    if (!show) {
-        icon_popup_hide(focus_cycle_popup);
-    } else {
-        Rect *a;
-        ObClient *p = c;
-        gchar *title = NULL;
-
-        a = screen_physical_area_monitor(0);
-        icon_popup_position(focus_cycle_popup, CenterGravity,
-                            a->x + a->width / 2, a->y + a->height / 2);
-/*        icon_popup_size(focus_cycle_popup, a->height/2, a->height/16);
-        icon_popup_show(focus_cycle_popup, c->title,
-                        client_icon(c, a->height/16, a->height/16));
-*/
-        /* XXX the size and the font extents need to be related on some level
-         */
-        icon_popup_size(focus_cycle_popup, POPUP_WIDTH, POPUP_HEIGHT);
-
-        /* use the transient's parent's title/icon */
-        while (p->transient_for && p->transient_for != OB_TRAN_GROUP)
-            p = p->transient_for;
-
-        if (p != c && !strcmp("", (c->iconic ? c->icon_title : c->title)))
-            title = g_strdup(p->iconic ? p->icon_title : p->title);
-            /*title = g_strconcat((c->iconic ? c->icon_title : c->title),
-                                " - ",
-                                (p->iconic ? p->icon_title : p->title),
-                                NULL);
-            */
-        icon_popup_show(focus_cycle_popup,
-                        (title ? title :
-                         (c->iconic ? c->icon_title : c->title)),
-                        client_icon(p, 48, 48));
-        g_free(title);
-    }
-}
-
-void focus_cycle_draw_indicator()
-{
-    if (!focus_cycle_target) {
-        XUnmapWindow(ob_display, focus_indicator.top.win);
-        XUnmapWindow(ob_display, focus_indicator.left.win);
-        XUnmapWindow(ob_display, focus_indicator.right.win);
-        XUnmapWindow(ob_display, focus_indicator.bottom.win);
-    } else {
-        /*
-          if (focus_cycle_target)
-              frame_adjust_focus(focus_cycle_target->frame, FALSE);
-          frame_adjust_focus(focus_cycle_target->frame, TRUE);
+    ob_debug_type(OB_DEBUG_FOCUS, "trying the focus order\n");
+    for (it = focus_order; it; it = g_list_next(it)) {
+        c = it->data;
+        /* fallback focus to a window if:
+           1. it is on the current desktop. this ignores omnipresent
+           windows, which are problematic in their own rite, unless they are
+           specifically allowed
+           2. it is a valid auto-focus target
+           3. it is not shaded
         */
-        gint x, y, w, h;
-        gint wt, wl, wr, wb;
-
-        wt = wl = wr = wb = MAX(3,
-                                MAX(1, MAX(ob_rr_theme->paddingx,
-                                           ob_rr_theme->paddingy)) * 2 +
-                                ob_rr_theme->fbwidth * 2);
-
-        x = focus_cycle_target->frame->area.x;
-        y = focus_cycle_target->frame->area.y;
-        w = focus_cycle_target->frame->area.width;
-        h = wt;
-
-        XMoveResizeWindow(ob_display, focus_indicator.top.win,
-                          x, y, w, h);
-        a_focus_indicator->texture[0].data.lineart.x1 = 0;
-        a_focus_indicator->texture[0].data.lineart.y1 = h-1;
-        a_focus_indicator->texture[0].data.lineart.x2 = 0;
-        a_focus_indicator->texture[0].data.lineart.y2 = 0;
-        a_focus_indicator->texture[1].data.lineart.x1 = 0;
-        a_focus_indicator->texture[1].data.lineart.y1 = 0;
-        a_focus_indicator->texture[1].data.lineart.x2 = w-1;
-        a_focus_indicator->texture[1].data.lineart.y2 = 0;
-        a_focus_indicator->texture[2].data.lineart.x1 = w-1;
-        a_focus_indicator->texture[2].data.lineart.y1 = 0;
-        a_focus_indicator->texture[2].data.lineart.x2 = w-1;
-        a_focus_indicator->texture[2].data.lineart.y2 = h-1;
-        a_focus_indicator->texture[3].data.lineart.x1 = (wl-1);
-        a_focus_indicator->texture[3].data.lineart.y1 = h-1;
-        a_focus_indicator->texture[3].data.lineart.x2 = w - wr;
-        a_focus_indicator->texture[3].data.lineart.y2 = h-1;
-        RrPaint(a_focus_indicator, focus_indicator.top.win,
-                w, h);
-
-        x = focus_cycle_target->frame->area.x;
-        y = focus_cycle_target->frame->area.y;
-        w = wl;
-        h = focus_cycle_target->frame->area.height;
-
-        XMoveResizeWindow(ob_display, focus_indicator.left.win,
-                          x, y, w, h);
-        a_focus_indicator->texture[0].data.lineart.x1 = w-1;
-        a_focus_indicator->texture[0].data.lineart.y1 = 0;
-        a_focus_indicator->texture[0].data.lineart.x2 = 0;
-        a_focus_indicator->texture[0].data.lineart.y2 = 0;
-        a_focus_indicator->texture[1].data.lineart.x1 = 0;
-        a_focus_indicator->texture[1].data.lineart.y1 = 0;
-        a_focus_indicator->texture[1].data.lineart.x2 = 0;
-        a_focus_indicator->texture[1].data.lineart.y2 = h-1;
-        a_focus_indicator->texture[2].data.lineart.x1 = 0;
-        a_focus_indicator->texture[2].data.lineart.y1 = h-1;
-        a_focus_indicator->texture[2].data.lineart.x2 = w-1;
-        a_focus_indicator->texture[2].data.lineart.y2 = h-1;
-        a_focus_indicator->texture[3].data.lineart.x1 = w-1;
-        a_focus_indicator->texture[3].data.lineart.y1 = wt-1;
-        a_focus_indicator->texture[3].data.lineart.x2 = w-1;
-        a_focus_indicator->texture[3].data.lineart.y2 = h - wb;
-        RrPaint(a_focus_indicator, focus_indicator.left.win,
-                w, h);
-
-        x = focus_cycle_target->frame->area.x +
-            focus_cycle_target->frame->area.width - wr;
-        y = focus_cycle_target->frame->area.y;
-        w = wr;
-        h = focus_cycle_target->frame->area.height ;
-
-        XMoveResizeWindow(ob_display, focus_indicator.right.win,
-                          x, y, w, h);
-        a_focus_indicator->texture[0].data.lineart.x1 = 0;
-        a_focus_indicator->texture[0].data.lineart.y1 = 0;
-        a_focus_indicator->texture[0].data.lineart.x2 = w-1;
-        a_focus_indicator->texture[0].data.lineart.y2 = 0;
-        a_focus_indicator->texture[1].data.lineart.x1 = w-1;
-        a_focus_indicator->texture[1].data.lineart.y1 = 0;
-        a_focus_indicator->texture[1].data.lineart.x2 = w-1;
-        a_focus_indicator->texture[1].data.lineart.y2 = h-1;
-        a_focus_indicator->texture[2].data.lineart.x1 = w-1;
-        a_focus_indicator->texture[2].data.lineart.y1 = h-1;
-        a_focus_indicator->texture[2].data.lineart.x2 = 0;
-        a_focus_indicator->texture[2].data.lineart.y2 = h-1;
-        a_focus_indicator->texture[3].data.lineart.x1 = 0;
-        a_focus_indicator->texture[3].data.lineart.y1 = wt-1;
-        a_focus_indicator->texture[3].data.lineart.x2 = 0;
-        a_focus_indicator->texture[3].data.lineart.y2 = h - wb;
-        RrPaint(a_focus_indicator, focus_indicator.right.win,
-                w, h);
-
-        x = focus_cycle_target->frame->area.x;
-        y = focus_cycle_target->frame->area.y +
-            focus_cycle_target->frame->area.height - wb;
-        w = focus_cycle_target->frame->area.width;
-        h = wb;
-
-        XMoveResizeWindow(ob_display, focus_indicator.bottom.win,
-                          x, y, w, h);
-        a_focus_indicator->texture[0].data.lineart.x1 = 0;
-        a_focus_indicator->texture[0].data.lineart.y1 = 0;
-        a_focus_indicator->texture[0].data.lineart.x2 = 0;
-        a_focus_indicator->texture[0].data.lineart.y2 = h-1;
-        a_focus_indicator->texture[1].data.lineart.x1 = 0;
-        a_focus_indicator->texture[1].data.lineart.y1 = h-1;
-        a_focus_indicator->texture[1].data.lineart.x2 = w-1;
-        a_focus_indicator->texture[1].data.lineart.y2 = h-1;
-        a_focus_indicator->texture[2].data.lineart.x1 = w-1;
-        a_focus_indicator->texture[2].data.lineart.y1 = h-1;
-        a_focus_indicator->texture[2].data.lineart.x2 = w-1;
-        a_focus_indicator->texture[2].data.lineart.y2 = 0;
-        a_focus_indicator->texture[3].data.lineart.x1 = wl-1;
-        a_focus_indicator->texture[3].data.lineart.y1 = 0;
-        a_focus_indicator->texture[3].data.lineart.x2 = w - wr;
-        a_focus_indicator->texture[3].data.lineart.y2 = 0;
-        RrPaint(a_focus_indicator, focus_indicator.bottom.win,
-                w, h);
-
-        XMapWindow(ob_display, focus_indicator.top.win);
-        XMapWindow(ob_display, focus_indicator.left.win);
-        XMapWindow(ob_display, focus_indicator.right.win);
-        XMapWindow(ob_display, focus_indicator.bottom.win);
+        if ((allow_omnipresent || c->desktop == screen_desktop) &&
+            focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE) &&
+            !c->shaded &&
+            (allow_refocus || client_focus_target(c) != old) &&
+            client_focus(c))
+        {
+            ob_debug_type(OB_DEBUG_FOCUS, "found in focus order\n");
+            return c;
+        }
     }
-}
-
-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 */
-    if ((ft->type == OB_CLIENT_TYPE_NORMAL ||
-         ft->type == OB_CLIENT_TYPE_DIALOG ||
-         (!client_has_group_siblings(ft) &&
-          (ft->type == OB_CLIENT_TYPE_TOOLBAR ||
-           ft->type == OB_CLIENT_TYPE_MENU ||
-           ft->type == OB_CLIENT_TYPE_UTILITY))) &&
-        ((ft->can_focus || ft->focus_notify) &&
-         !ft->skip_pager &&
-         (ft->desktop == screen_desktop || ft->desktop == DESKTOP_ALL)) &&
-        ft == client_focus_target(ft))
-        return TRUE;
-/*
-    {
-        GSList *it;
 
-        for (it = ft->transients; it; it = g_slist_next(it)) {
-            ObClient *c = it->data;
-
-            if (c->frame->visible)
-                return FALSE;
+    ob_debug_type(OB_DEBUG_FOCUS, "trying a desktop window\n");
+    for (it = focus_order; it; it = g_list_next(it)) {
+        c = it->data;
+        /* fallback focus to a window if:
+           1. it is on the current desktop. this ignores omnipresent
+           windows, which are problematic in their own rite.
+           2. it is a normal type window, don't fall back onto a dock or
+           a splashscreen or a desktop window (save the desktop as a
+           backup fallback though)
+        */
+        if (focus_valid_target(c, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE) &&
+            (allow_refocus || client_focus_target(c) != old) &&
+            client_focus(c))
+        {
+            ob_debug_type(OB_DEBUG_FOCUS, "found a desktop window\n");
+            return c;
         }
-        return TRUE;
     }
-*/
 
-    return FALSE;
+    return NULL;
 }
 
-void focus_cycle(gboolean forward, gboolean linear, gboolean interactive,
-                 gboolean dialog, gboolean done, gboolean cancel, Time time)
+ObClient* focus_fallback(gboolean allow_refocus, gboolean allow_pointer,
+                         gboolean allow_omnipresent, gboolean focus_lost)
 {
-    static ObClient *first = NULL;
-    static ObClient *t = NULL;
-    static GList *order = NULL;
-    GList *it, *start, *list;
-    ObClient *ft = NULL;
-
-    if (interactive) {
-        if (cancel) {
-            focus_cycle_target = NULL;
-            goto done_cycle;
-        } else if (done)
-            goto done_cycle;
-
-        if (!focus_order)
-            goto done_cycle;
-
-        if (!first) first = focus_client;
-
-        if (linear) list = client_list;
-        else        list = focus_order;
-    } else {
-        if (!focus_order)
-            goto done_cycle;
-        list = client_list;
-    }
-    if (!focus_cycle_target) focus_cycle_target = focus_client;
-
-    start = it = g_list_find(list, focus_cycle_target);
-    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 = g_list_first(list);
-        } else {
-            it = it->prev;
-            if (it == NULL) it = g_list_last(list);
-        }
-        ft = it->data;
-        if (valid_focus_target(ft)) {
-            if (interactive) {
-                if (ft != focus_cycle_target) { /* prevents flicker */
-                    focus_cycle_target = ft;
-                    focus_cycle_draw_indicator();
-                }
-                popup_cycle(ft, dialog);
-                return;
-            } else if (ft != focus_cycle_target) {
-                focus_cycle_target = ft;
-                done = TRUE;
-                break;
-            }
-        }
-    } while (it != start);
+    ObClient *new;
+    ObClient *old = focus_client;
 
-done_cycle:
-    if (done && focus_cycle_target)
-        client_activate(focus_cycle_target, FALSE, TRUE, time);
+    /* unfocus any focused clients.. they can be focused by Pointer events
+       and such, and then when we try focus them, we won't get a FocusIn
+       event at all for them. */
+    if (focus_lost)
+        focus_nothing();
 
-    t = NULL;
-    first = NULL;
-    focus_cycle_target = NULL;
-    g_list_free(order);
-    order = NULL;
+    new = focus_fallback_target(allow_refocus, allow_pointer,
+                                allow_omnipresent, old);
+    /* get what was really focused */
+    if (new) new = client_focus_target(new);
 
-    if (interactive) {
-        focus_cycle_draw_indicator();
-        popup_cycle(ft, FALSE);
-    }
-
-    return;
+    return new;
 }
 
-void focus_directional_cycle(ObDirection dir, gboolean interactive,
-                             gboolean dialog, gboolean done, gboolean cancel,
-                             Time time)
+void focus_nothing(void)
 {
-    static ObClient *first = NULL;
-    ObClient *ft = NULL;
-
-    if (!interactive)
-        return;
-
-    if (cancel) {
-        focus_cycle_target = NULL;
-        goto done_cycle;
-    } else if (done)
-        goto done_cycle;
-
-    if (!focus_order)
-        goto done_cycle;
-
-    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;
-
-        for (it = focus_order; it; it = g_list_next(it))
-            if (valid_focus_target(it->data))
-                ft = it->data;
-    }
-        
-    if (ft) {
-        if (ft != focus_cycle_target) {/* prevents flicker */
-            focus_cycle_target = ft;
-            focus_cycle_draw_indicator();
-        }
-    }
-    if (focus_cycle_target) {
-        popup_cycle(focus_cycle_target, dialog);
-        if (dialog)
-            return;
-    }
-
-
-done_cycle:
-    if (done && focus_cycle_target)
-        client_activate(focus_cycle_target, FALSE, TRUE, time);
-
-    first = NULL;
-    focus_cycle_target = NULL;
-
-    focus_cycle_draw_indicator();
-    popup_cycle(ft, FALSE);
+    /* nothing is focused, update the colormap and _the root property_ */
+    focus_set_client(NULL);
 
-    return;
+    /* when nothing will be focused, send focus to the backup target */
+    XSetInputFocus(ob_display, screen_support_win, RevertToPointerRoot,
+                   event_curtime);
 }
 
 void focus_order_add_new(ObClient *c)
@@ -645,11 +205,17 @@ void focus_order_add_new(ObClient *c)
         else
             focus_order = g_list_insert(focus_order, c, 1);
     }
+
+    /* in the middle of cycling..? kill it. */
+    focus_cycle_stop(c);
 }
 
 void focus_order_remove(ObClient *c)
 {
     focus_order = g_list_remove(focus_order, c);
+
+    /* in the middle of cycling..? kill it. */
+    focus_cycle_stop(c);
 }
 
 void focus_order_to_top(ObClient *c)
@@ -692,3 +258,96 @@ ObClient *focus_order_find_first(guint desktop)
     }
     return NULL;
 }
+
+/*! Returns if a focus target has valid group siblings that can be cycled
+  to in its place */
+static gboolean focus_target_has_siblings(ObClient *ft,
+                                          gboolean iconic_windows,
+                                          gboolean all_desktops)
+
+{
+    GSList *it;
+
+    if (!ft->group) return FALSE;
+
+    for (it = ft->group->members; it; it = g_slist_next(it)) {
+        ObClient *c = it->data;
+        /* check that it's not a helper window to avoid infinite recursion */
+        if (c != ft && c->type == OB_CLIENT_TYPE_NORMAL &&
+            focus_valid_target(c, TRUE, iconic_windows, all_desktops,
+                               FALSE, FALSE, FALSE))
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+gboolean focus_valid_target(ObClient *ft,
+                            gboolean helper_windows,
+                            gboolean iconic_windows,
+                            gboolean all_desktops,
+                            gboolean dock_windows,
+                            gboolean desktop_windows,
+                            gboolean user_request)
+{
+    gboolean ok = FALSE;
+
+    /* it's on this desktop unless you want all desktops.
+
+       do this check first because it will usually filter out the most
+       windows */
+    ok = (all_desktops || ft->desktop == screen_desktop ||
+          ft->desktop == DESKTOP_ALL);
+
+    /* the window can receive focus somehow */
+    ok = ok && (ft->can_focus || ft->focus_notify);
+
+    /* the window is not iconic, or we're allowed to go to iconic ones */
+    ok = ok && (iconic_windows || !ft->iconic);
+
+    /* it's the right type of window */
+    if (dock_windows || desktop_windows)
+        ok = ok && ((dock_windows && ft->type == OB_CLIENT_TYPE_DOCK) ||
+                    (desktop_windows && ft->type == OB_CLIENT_TYPE_DESKTOP));
+    /* modal windows are important and can always get focus if they are
+       visible and stuff, so don't change 'ok' based on their type */
+    else if (!ft->modal)
+        /* normal non-helper windows are valid targets */
+        ok = ok &&
+            ((client_normal(ft) && !client_helper(ft))
+             ||
+             /* helper windows are valid targets if... */
+             (client_helper(ft) &&
+              /* ...a window in its group already has focus and we want to
+                 include helper windows ... */
+              ((focus_client && ft->group == focus_client->group &&
+                helper_windows) ||
+               /* ... or if there are no other windows in its group
+                  that can be focused instead */
+               !focus_target_has_siblings(ft, iconic_windows, all_desktops))));
+
+    /* it's not set to skip the taskbar (but this only applies to normal typed
+       windows, and is overridden if the window is modal or if the user asked
+       for this window to be focused) */
+    ok = ok && (ft->type != OB_CLIENT_TYPE_NORMAL ||
+                ft->modal ||
+                user_request ||
+                !ft->skip_taskbar);
+
+    /* it's not going to just send focus off somewhere else (modal window),
+       unless that modal window is not one of our valid targets, then let
+       you choose this window and bring the modal one here */
+    {
+        ObClient *cft = client_focus_target(ft);
+        ok = ok && (ft == cft || !focus_valid_target(cft,
+                                                     TRUE,
+                                                     iconic_windows,
+                                                     all_desktops,
+                                                     dock_windows,
+                                                     desktop_windows,
+                                                     FALSE));
+    }
+
+    return ok;
+}