split the focustobottom action back out from unfocus

diff --git a/.gitignore b/.gitignore
index 6563e0053deadcbba9305b19a6d92dd6b5083216..8ec02cff259ec757d3b0ccf85c4320fae9f79f2f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -30,7 +30,6 @@ m4/*.m4
 *.la
 missing
 .dirstamp
-openbox/actions/focustobottom.c
 openbox/openbox
 parser/obparser-3.0.pc
 po/Makefile.in.in

diff --git a/Makefile.am b/Makefile.am
index a4ebcc8c44e26d8141194b3184aaa9cb058b2d67..07c7ce6883f39afe60773b3c41760f51a002cbd0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -162,6 +162,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/execute.c \
        openbox/actions/exit.c \
        openbox/actions/focus.c \
+       openbox/actions/focustobottom.c \
        openbox/actions/fullscreen.c \
        openbox/actions/growtoedge.c \
        openbox/actions/iconify.c \

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 430d781d844a56e1c6ed28ef5d92596613bcda1b..06858c05e693c4602581f8f1a368b53fd21e2190 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -37,4 +37,5 @@ void action_all_startup()
     action_movetoedge_startup();
     action_growtoedge_startup();
     action_if_startup();
+    action_focustobottom_startup();
 }

diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index 62d3faa89672be357179e05e70cc8c45063e349b..5f3f573f247a967e3c1e19f3b5c85b29a8584b7b 100644 (file)
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -38,5 +38,6 @@ void action_layer_startup();
 void action_movetoedge_startup();
 void action_growtoedge_startup();
 void action_if_startup();
+void action_focustobottom_startup();
 
 #endif

diff --git a/openbox/actions/focustobottom.c b/openbox/actions/focustobottom.c
new file mode 100644 (file)
index 0000000..74d48e3
--- /dev/null
+++ b/openbox/actions/focustobottom.c
@@ -0,0 +1,17 @@
+#include "openbox/actions.h"
+#include "openbox/focus.h"
+
+static gboolean run_func(ObActionsData *data, gpointer options);
+
+void action_focustobottom_startup()
+{
+    actions_register("FocusToBottom", NULL, NULL, run_func, NULL, NULL);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    if (data->client)
+        focus_order_to_bottom(data->client);
+    return FALSE;
+}

diff --git a/openbox/actions/unfocus.c b/openbox/actions/unfocus.c
index d581864e99ec8afff4ace2713fd04f6a515bc7f2..70384f4d2528b4016174aaeedf4bccb6f0196555 100644 (file)
--- a/openbox/actions/unfocus.c
+++ b/openbox/actions/unfocus.c
@@ -1,53 +1,17 @@
 #include "openbox/actions.h"
 #include "openbox/focus.h"
 
-typedef struct {
-    gboolean tobottom;
-} 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_unfocus_startup()
 {
-    actions_register("Unfocus",
-                     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->tobottom = TRUE;
-
-    if ((n = parse_find_node("tobottom", node)))
-        o->tobottom = parse_bool(doc, n);
-    return o;
-}
-
-static void free_func(gpointer options)
-{
-    Options *o = options;
-
-    g_free(o);
+    actions_register("Unfocus", NULL, NULL, run_func, NULL, NULL);
 }
 
 /* Always return FALSE because its not interactive */
 static gboolean run_func(ObActionsData *data, gpointer options)
 {
-    Options *o = options;
-
-    if (data->client && data->client == focus_client) {
-        if (o->tobottom)
-            focus_order_to_bottom(data->client);
+    if (data->client && data->client == focus_client)
         focus_fallback(FALSE, FALSE, TRUE);
-    }
-
     return FALSE;
 }