@@ -158,8 +158,7 @@ openbox/actions/debug.c \
 	openbox/actions/decorations.c \
 	openbox/actions/desktop.c \
 	openbox/actions/dockautohide.c \
-	openbox/actions/directionalcyclewindows.c \
-	openbox/actions/directionaltargetwindow.c \
+	openbox/actions/directionalwindows.c \
 	openbox/actions/execute.c \
 	openbox/actions/exit.c \
 	openbox/actions/focus.c \

@@ -293,6 +293,11 @@ interactive_act = act;
         actions_act_ref(interactive_act);
 
         interactive_initial_state = state;
+
+        /* if using focus_delay, stop the timer now so that focus doesn't go
+           moving on us, which would kill the action */
+        event_halt_focus_delay();
+    
         return TRUE;
     }
     else

@@ -26,8 +26,7 @@ action_moverelative_startup();
     action_shade_startup();
     action_kill_startup();
     action_omnipresent_startup();
-    action_directionalcyclewindows_startup();
-    action_directionaltargetwindow_startup();
+    action_directionalwindows_startup();
     action_resize_startup();
     action_decorations_startup();
     action_desktop_startup();

@@ -27,8 +27,7 @@ void action_moverelative_startup();
 void action_shade_startup();
 void action_kill_startup();
 void action_omnipresent_startup();
-void action_directionalcyclewindows_startup();
-void action_directionaltargetwindow_startup();
+void action_directionalwindows_startup();
 void action_resize_startup();
 void action_decorations_startup();
 void action_desktop_startup();

@@ -112,10 +112,6 @@ 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_cycle(o->forward,
                 o->all_desktops,
                 o->dock_windows,
@@ -180,10 +176,10 @@ o->linear,
                      TRUE,
                      o->dialog,
                      TRUE, cancel);
+    cycling = FALSE;
 
     if (ft) {
         actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,
                          state, -1, -1, 0, OB_FRAME_CONTEXT_NONE, ft);
     }
-    cycling = FALSE;
 }

@@ -6,6 +6,7 @@ #include "openbox/misc.h"
 #include "gettext.h"
 
 typedef struct {
+    gboolean interactive;
     gboolean dialog;
     gboolean dock_windows;
     gboolean desktop_windows;
@@ -13,7 +14,13 @@ ObDirection direction;
     GSList *actions;
 } Options;
 
+static gboolean cycling = FALSE;
+
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node);
+static gpointer setup_cycle_func(ObParseInst *i, xmlDocPtr doc,
+                                 xmlNodePtr node);
+static gpointer setup_target_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,
@@ -24,14 +31,12 @@ static void     i_cancel_func(gpointer options);
 
 static void     end_cycle(gboolean cancel, guint state, Options *o);
 
-void action_directionalcyclewindows_startup()
+void action_directionalwindows_startup()
 {
-    actions_register("DirectionalCycleWindows",
-                     setup_func,
-                     free_func,
-                     run_func,
-                     i_input_func,
-                     i_cancel_func);
+    actions_register("DirectionalCycleWindows", setup_cycle_func, free_func,
+                     run_func, i_input_func, i_cancel_func);
+    actions_register("DirectionalTargetWindow", setup_target_func, free_func,
+                     run_func, NULL, NULL);
 }
 
 static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
@@ -83,12 +88,42 @@ if (action) o->actions = g_slist_prepend(o->actions, action);
             m = parse_find_node("action", m->next);
         }
     }
+    else {
+        o->actions = g_slist_prepend(o->actions,
+                                     actions_parse_string("Focus"));
+        o->actions = g_slist_prepend(o->actions,
+                                     actions_parse_string("Raise"));
+        o->actions = g_slist_prepend(o->actions,
+                                     actions_parse_string("Unshade"));
+    }
+
+    return o;
+}
+
+static gpointer setup_cycle_func(ObParseInst *i, xmlDocPtr doc,
+                                 xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->interactive = TRUE;
+    return o;
+}
+
+static gpointer setup_target_func(ObParseInst *i, xmlDocPtr doc,
+                                  xmlNodePtr node)
+{
+    Options *o = setup_func(i, doc, node);
+    o->interactive = FALSE;
     return o;
 }
 
 static void free_func(gpointer options)
 {
     Options *o = options;
+
+    while (o->actions) {
+        actions_act_unref(o->actions->data);
+        o->actions = g_slist_delete_link(o->actions, o->actions);
+    }
 
     g_free(o);
 }
@@ -97,18 +132,19 @@ 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);
+    if (o->interactive)
+        end_cycle(FALSE, data->state, o);
+    else {
+        focus_directional_cycle(o->direction,
+                                o->dock_windows,
+                                o->desktop_windows,
+                                TRUE,
+                                o->dialog,
+                                FALSE, FALSE);
+        cycling = TRUE;
+    }
 
-    return TRUE;
+    return o->interactive;
 }
 
 static gboolean i_input_func(guint initial_state,
@@ -144,7 +180,10 @@ }
 
 static void i_cancel_func(gpointer options)
 {
-    end_cycle(TRUE, 0, options);
+    /* we get cancelled when we move focus, but we're not cycling anymore, so
+       just ignore that */
+    if (cycling)
+        end_cycle(TRUE, 0, options);
 }
 
 static void end_cycle(gboolean cancel, guint state, Options *o)
@@ -157,6 +196,7 @@ o->desktop_windows,
                                  TRUE,
                                  o->dialog,
                                  TRUE, cancel);
+    cycling = FALSE;
 
     if (ft) {
         actions_run_acts(o->actions, OB_USER_ACTION_KEYBOARD_KEY,

@@ -1,109 +0,0 @@ 
-#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);
-
-void action_directionaltargetwindow_startup()
-{
-    actions_register("DirectionalTargetWindow",
-                     setup_func,
-                     free_func,
-                     run_func,
-                     NULL, NULL);
-}
-
-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") ||
-            !g_ascii_strcasecmp(s, "up"))
-            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") ||
-                 !g_ascii_strcasecmp(s, "left"))
-            o->direction = OB_DIRECTION_WEST;
-        else if (!g_ascii_strcasecmp(s, "east") ||
-                 !g_ascii_strcasecmp(s, "right"))
-            o->direction = OB_DIRECTION_EAST;
-        else if (!g_ascii_strcasecmp(s, "south") ||
-                 !g_ascii_strcasecmp(s, "down"))
-            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("finalactions", 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;
-    struct _ObClient *ft;
-
-    /* if using focus_delay, stop the timer now so that focus doesn't go moving
-       on us */
-    event_halt_focus_delay();
-    
-    ft = focus_directional_cycle(o->direction,
-                                 o->dock_windows,
-                                 o->desktop_windows,
-                                 FALSE,
-                                 o->dialog,
-                                 TRUE, FALSE);
-
-    if (ft)
-        actions_run_acts(o->actions, data->uact, data->state,
-                         data->x, data->y, data->button, data->context, ft);
-
-    return FALSE;
-}