@@ -165,6 +165,7 @@ openbox/actions/exit.c \
 	openbox/actions/focus.c \
 	openbox/actions/fullscreen.c \
 	openbox/actions/iconify.c \
+	openbox/actions/kill.c \
 	openbox/actions/lower.c \
 	openbox/actions/maximize.c \
 	openbox/actions/maximizehorizontal.c \

@@ -455,11 +455,6 @@ action_directional_focus,
         setup_action_directional_focus_northwest
     },
     {
-        "kill",
-        action_kill,
-        setup_client_action
-    },
-    {
         "shadelower",
         action_shadelower,
         setup_client_action
@@ -923,11 +918,6 @@ if (data->client.any.c->shaded)
         action_lower(data);
     else
         action_shade(data);
-}
-
-void action_kill(union ActionData *data)
-{
-    client_kill(data->client.any.c);
 }
 
 void action_toggle_omnipresent(union ActionData *data)

@@ -26,4 +26,5 @@ action_maximizevertical_startup();
     action_moveto_startup();
     action_moverelative_startup();
     action_shade_startup();
+    action_kill_startup();
 }

@@ -27,5 +27,6 @@ void action_maximizevertical_startup();
 void action_moveto_startup();
 void action_moverelative_startup();
 void action_shade_startup();
+void action_kill_startup();
 
 #endif

@@ -0,0 +1,20 @@ 
+#include "openbox/actions.h"
+#include "openbox/client.h"
+
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+void action_close_startup()
+{
+    actions_register("Close",
+                     NULL, NULL,
+                     run_func,
+                     NULL, NULL);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    if (data->client) client_close(data->client);
+
+    return FALSE;
+}

@@ -0,0 +1,152 @@ 
+#include "openbox/actions.h"
+#include "openbox/event.h"
+#include "openbox/focus_cycle.h"
+#include "openbox/openbox.h"
+#include "gettext.h"
+
+typedef struct {
+    gboolean linear;
+    gboolean dialog;
+    gboolean dock_windows;
+    gboolean desktop_windows;
+    gboolean all_desktops;
+    gboolean forward;
+    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_cyclewindows_startup()
+{
+    actions_register("CycleWindows",
+                     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("forward", node)))
+        o->forward = parse_bool(doc, n);
+    if ((n = parse_find_node("linear", node)))
+        o->linear = parse_bool(doc, n);
+    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("allDesktops", node)))
+        o->all_desktops = parse_bool(doc, n);
+
+    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_cycle(o->forward,
+                o->all_desktops,
+                o->dock_windows,
+                o->desktop_windows,
+                o->linear,
+                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_cycle(o->forward,
+                     o->all_desktops,
+                     o->dock_windows,
+                     o->desktop_windows,
+                     o->linear,
+                     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);
+    }
+}

@@ -0,0 +1,21 @@ 
+#include "openbox/actions.h"
+#include "openbox/stacking.h"
+
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+void action_kill_startup()
+{
+    actions_register("Kill",
+                     NULL, NULL,
+                     run_func,
+                     NULL, NULL);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    if (data->client)
+        client_kill(data->client);
+
+    return FALSE;
+}