put focus_cycle into focus.c, use it there in the action. improved it as well to...

[chaz/openbox] / openbox / action.c

diff --git a/openbox/action.c b/openbox/action.c
index cc934206ce58935654a6c77a09868b716070d310..8196ef673e096798806dba3410d49ca91bd67bd7 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -716,54 +716,7 @@ void action_showmenu(union ActionData *data)
 
 void action_cycle_windows(union ActionData *data)
 {
-    static Client *first = NULL;
-    static Client *t = NULL;
-    static GList *order = NULL;
-    GList *it, *start, *list;
-
-    if (data->cycle.cancel) {
-        if (first) client_focus(first);
-        goto done_cycle;
-    }
-    if (!first) first = focus_client;
-
-    if (data->cycle.linear)
-        list = client_list;
-    else {
-        if (!order) order = g_list_copy(focus_order[screen_desktop]);
-        list = order;
-    }
-    start = it = g_list_find(list, data->cycle.c);
-    if (!start) goto done_cycle;
-
-    if (!data->cycle.final) {
-        t = NULL;
-        if (!start) /* switched desktops or something? */
-            goto done_cycle;
-
-        do {
-            if (data->cycle.forward) {
-                it = it->next;
-                if (it == NULL) it = list;
-            } else {
-                it = it->prev;
-                if (it == NULL) it = g_list_last(list);
-            }
-            if (client_focus(it->data)) {
-                t = it->data;
-                focus_ignore_in++;
-                break;
-            }
-        } while (it != start);
-    } else {
-        if (t) stacking_raise(t);
-        goto done_cycle;
-    }
-    return;
-
-    done_cycle:
-        first = NULL;
-        g_list_free(order);
-        order = NULL;
+    focus_cycle(data->cycle.forward, data->cycle.linear, data->cycle.final,
+                data->cycle.cancel);
 }