@@ -160,6 +160,7 @@ openbox/actions/breakchroot.c \
 	openbox/actions/close.c \
 	openbox/actions/cyclewindows.c \
 	openbox/actions/debug.c \
+	openbox/actions/directionalcyclewindows.c \
 	openbox/actions/execute.c \
 	openbox/actions/exit.c \
 	openbox/actions/focus.c \

@@ -96,78 +96,6 @@ 
     return a;
 }
 
-void setup_action_directional_focus_north(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_NORTH;
-    (*a)->data.interdiraction.dialog = TRUE;
-    (*a)->data.interdiraction.dock_windows = FALSE;
-    (*a)->data.interdiraction.desktop_windows = FALSE;
-}
-
-void setup_action_directional_focus_east(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_EAST;
-    (*a)->data.interdiraction.dialog = TRUE;
-    (*a)->data.interdiraction.dock_windows = FALSE;
-    (*a)->data.interdiraction.desktop_windows = FALSE;
-}
-
-void setup_action_directional_focus_south(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTH;
-    (*a)->data.interdiraction.dialog = TRUE;
-    (*a)->data.interdiraction.dock_windows = FALSE;
-    (*a)->data.interdiraction.desktop_windows = FALSE;
-}
-
-void setup_action_directional_focus_west(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_WEST;
-    (*a)->data.interdiraction.dialog = TRUE;
-    (*a)->data.interdiraction.dock_windows = FALSE;
-    (*a)->data.interdiraction.desktop_windows = FALSE;
-}
-
-void setup_action_directional_focus_northeast(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHEAST;
-    (*a)->data.interdiraction.dialog = TRUE;
-    (*a)->data.interdiraction.dock_windows = FALSE;
-    (*a)->data.interdiraction.desktop_windows = FALSE;
-}
-
-void setup_action_directional_focus_southeast(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHEAST;
-    (*a)->data.interdiraction.dialog = TRUE;
-    (*a)->data.interdiraction.dock_windows = FALSE;
-    (*a)->data.interdiraction.desktop_windows = FALSE;
-}
-
-void setup_action_directional_focus_southwest(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_SOUTHWEST;
-    (*a)->data.interdiraction.dialog = TRUE;
-    (*a)->data.interdiraction.dock_windows = FALSE;
-    (*a)->data.interdiraction.desktop_windows = FALSE;
-}
-
-void setup_action_directional_focus_northwest(ObAction **a, ObUserAction uact)
-{
-    (*a)->data.interdiraction.inter.any.interactive = TRUE;
-    (*a)->data.interdiraction.direction = OB_DIRECTION_NORTHWEST;
-    (*a)->data.interdiraction.dialog = TRUE;
-    (*a)->data.interdiraction.dock_windows = FALSE;
-    (*a)->data.interdiraction.desktop_windows = FALSE;
-}
-
 void setup_action_send_to_desktop(ObAction **a, ObUserAction uact)
 {
     (*a)->data.sendto.any.client_action = OB_CLIENT_ACTION_ALWAYS;
@@ -415,46 +343,6 @@ 
 ActionString actionstrings[] =
 {
     {
-        "directionalfocusnorth", 
-        action_directional_focus, 
-        setup_action_directional_focus_north
-    },
-    {
-        "directionalfocuseast", 
-        action_directional_focus, 
-        setup_action_directional_focus_east
-    },
-    {
-        "directionalfocussouth", 
-        action_directional_focus, 
-        setup_action_directional_focus_south
-    },
-    {
-        "directionalfocuswest",
-        action_directional_focus,
-        setup_action_directional_focus_west
-    },
-    {
-        "directionalfocusnortheast",
-        action_directional_focus,
-        setup_action_directional_focus_northeast
-    },
-    {
-        "directionalfocussoutheast",
-        action_directional_focus,
-        setup_action_directional_focus_southeast
-    },
-    {
-        "directionalfocussouthwest",
-        action_directional_focus,
-        setup_action_directional_focus_southwest
-    },
-    {
-        "directionalfocusnorthwest",
-        action_directional_focus,
-        setup_action_directional_focus_northwest
-    },
-    {
         "shadelower",
         action_shadelower,
         setup_client_action
@@ -754,14 +642,6 @@ if ((n = parse_find_node("follow", node->xmlChildrenNode)))
                     act->data.sendtodir.follow = parse_bool(doc, n);
                 if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
                     act->data.sendtodir.inter.any.interactive =
-                        parse_bool(doc, n);
-            } else if (act->func == action_directional_focus) {
-                if ((n = parse_find_node("dialog", node->xmlChildrenNode)))
-                    act->data.interdiraction.dialog = parse_bool(doc, n);
-                if ((n = parse_find_node("panels", node->xmlChildrenNode)))
-                    act->data.interdiraction.dock_windows = parse_bool(doc, n);
-                if ((n = parse_find_node("desktop", node->xmlChildrenNode)))
-                    act->data.interdiraction.desktop_windows =
                         parse_bool(doc, n);
             } else if (act->func == action_resize) {
                 if ((n = parse_find_node("edge", node->xmlChildrenNode))) {

@@ -28,4 +28,5 @@ action_moverelative_startup();
     action_shade_startup();
     action_kill_startup();
     action_omnipresent_startup();
+    action_directionalcyclewindows_startup();
 }

@@ -29,5 +29,6 @@ void action_moverelative_startup();
 void action_shade_startup();
 void action_kill_startup();
 void action_omnipresent_startup();
+void action_directionalcyclewindows_startup();
 
 #endif

@@ -0,0 +1,161 @@ 
+#include "openbox/actions.h"
+#include "openbox/event.h"
+#include "openbox/focus_cycle.h"
+#include "openbox/openbox.h"
+#include "openbox/misc.h"
+#include "gettext.h"
+
+typedef struct {
+    gboolean dialog;
+    gboolean dock_windows;
+    gboolean desktop_windows;
+    ObDirection direction;
+    GSList *actions;
+} Options;
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static void     free_func(gpointer options);
+static gboolean run_func(ObActionsData *data, gpointer options);
+static gboolean i_input_func(guint initial_state,
+                             XEvent *e,
+                             gpointer options,
+                             gboolean *used);
+static void     i_cancel_func(gpointer options);
+
+static void     end_cycle(gboolean cancel, guint state, Options *o);
+
+void action_directionalcyclewindows_startup()
+{
+    actions_register("DirectionalCycleWindows",
+                     setup_func,
+                     free_func,
+                     run_func,
+                     i_input_func,
+                     i_cancel_func);
+}
+
+static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
+{
+    xmlNodePtr n;
+    Options *o;
+
+    o = g_new0(Options, 1);
+    o->dialog = TRUE;
+
+    if ((n = parse_find_node("dialog", node)))
+        o->dialog = parse_bool(doc, n);
+    if ((n = parse_find_node("panels", node)))
+        o->dock_windows = parse_bool(doc, n);
+    if ((n = parse_find_node("desktop", node)))
+        o->desktop_windows = parse_bool(doc, n);
+    if ((n = parse_find_node("direction", node))) {
+        gchar *s = parse_string(doc, n);
+        if (!g_ascii_strcasecmp(s, "north"))
+            o->direction = OB_DIRECTION_NORTH;
+        else if (!g_ascii_strcasecmp(s, "northwest"))
+            o->direction = OB_DIRECTION_NORTHWEST;
+        else if (!g_ascii_strcasecmp(s, "northeast"))
+            o->direction = OB_DIRECTION_NORTHEAST;
+        else if (!g_ascii_strcasecmp(s, "west"))
+            o->direction = OB_DIRECTION_WEST;
+        else if (!g_ascii_strcasecmp(s, "east"))
+            o->direction = OB_DIRECTION_EAST;
+        else if (!g_ascii_strcasecmp(s, "south"))
+            o->direction = OB_DIRECTION_NORTH;
+        else if (!g_ascii_strcasecmp(s, "southwest"))
+            o->direction = OB_DIRECTION_NORTHWEST;
+        else if (!g_ascii_strcasecmp(s, "southeast"))
+            o->direction = OB_DIRECTION_NORTHEAST;
+        g_free(s);
+    }
+
+    if ((n = parse_find_node("actions", node))) {
+        xmlNodePtr m;
+
+        m = parse_find_node("action", n->xmlChildrenNode);
+        while (m) {
+            ObActionsAct *action = actions_parse(i, doc, m);
+            if (action) o->actions = g_slist_prepend(o->actions, action);
+            m = parse_find_node("action", m->next);
+        }
+    }
+    return o;
+}
+
+static void free_func(gpointer options)
+{
+    Options *o = options;
+
+    g_free(o);
+}
+
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    Options *o = options;
+
+    /* if using focus_delay, stop the timer now so that focus doesn't go moving
+       on us */
+    event_halt_focus_delay();
+    
+    focus_directional_cycle(o->direction,
+                            o->dock_windows,
+                            o->desktop_windows,
+                            TRUE,
+                            o->dialog,
+                            FALSE, FALSE);
+
+    return TRUE;
+}
+
+static gboolean i_input_func(guint initial_state,
+                             XEvent *e,
+                             gpointer options,
+                             gboolean *used)
+{
+    if (e->type == KeyPress) {
+        /* Escape cancels no matter what */
+        if (e->xkey.keycode == ob_keycode(OB_KEY_ESCAPE)) {
+            end_cycle(TRUE, e->xkey.state, options);
+            return FALSE;
+        }
+
+        /* There were no modifiers and they pressed enter */
+        else if (e->xkey.keycode == ob_keycode(OB_KEY_RETURN) &&
+                 !initial_state)
+        {
+            end_cycle(FALSE, e->xkey.state, options);
+            return FALSE;
+        }
+    }
+    /* They released the modifiers */
+    else if (e->type == KeyRelease && initial_state &&
+             (e->xkey.state & initial_state) == 0)
+    {
+        end_cycle(FALSE, e->xkey.state, options);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+static void i_cancel_func(gpointer options)
+{
+    end_cycle(TRUE, 0, options);
+}
+
+static void end_cycle(gboolean cancel, guint state, Options *o)
+{
+    struct _ObClient *ft;
+
+    ft = focus_directional_cycle(o->direction,
+                                 o->dock_windows,
+                                 o->desktop_windows,
+                                 TRUE,
+                                 o->dialog,
+                                 TRUE, cancel);
+
+    if (ft) {
+        actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
+                         state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
+    }
+}