add omnipresent action

diff --git a/Makefile.am b/Makefile.am
index 15c22087e181c17857983aae7de620f7be00dd61..612dca01a1d52aef9553161815c82f6906b9c7bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -173,6 +173,7 @@ openbox_openbox_SOURCES = \
        openbox/actions/move.c \
        openbox/actions/moverelative.c \
        openbox/actions/moveto.c \
+       openbox/actions/omnipresent.c \
        openbox/actions/raise.c \
        openbox/actions/raiselower.c \
        openbox/actions/reconfigure.c \

diff --git a/openbox/action.c b/openbox/action.c
index bc1db1015643e759629c7c717dce0ce7cc42fedb..110a9fd49e322cdc45e4800e74492c9210896693 100644 (file)
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -464,11 +464,6 @@ ActionString actionstrings[] =
         action_unshaderaise,
         setup_client_action
     },
-    {
-        "toggleomnipresent",
-        action_toggle_omnipresent,
-        setup_client_action
-    },
     {
         "resizerelativevert",
         action_resize_relative_vert,
@@ -920,13 +915,6 @@ void action_shadelower(union ActionData *data)
         action_shade(data);
 }
 
-void action_toggle_omnipresent(union ActionData *data)
-{ 
-    client_set_desktop(data->client.any.c,
-                       data->client.any.c->desktop == DESKTOP_ALL ?
-                       screen_desktop : DESKTOP_ALL, FALSE, TRUE);
-}
-
 void action_resize_relative_horz(union ActionData *data)
 {
     ObClient *c = data->relative.any.c;

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 9b11b49b39417796a3f65af87ebe7170f8da4b06..f303c099ea51bff6381313cf95cc29fad702fc89 100644 (file)
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -27,4 +27,5 @@ void action_all_startup()
     action_moverelative_startup();
     action_shade_startup();
     action_kill_startup();
+    action_omnipresent_startup();
 }

diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index 265ec4283a55ac472412382c58e50f890736d0b3..17bba0af0ee5cdcec9292e529a74c1a7ef6bc1d8 100644 (file)
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -28,5 +28,6 @@ void action_moveto_startup();
 void action_moverelative_startup();
 void action_shade_startup();
 void action_kill_startup();
+void action_omnipresent_startup();
 
 #endif

diff --git a/openbox/actions/omnipresent.c b/openbox/actions/omnipresent.c
new file mode 100644 (file)
index 0000000..02bd991
--- /dev/null
+++ b/openbox/actions/omnipresent.c
@@ -0,0 +1,62 @@
+#include "openbox/actions.h"
+#include "openbox/client.h"
+#include "openbox/screen.h"
+
+typedef struct {
+    gboolean toggle;
+    gboolean on;
+} 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_omnipresent_startup()
+{
+    actions_register("omnipresent",
+                     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->toggle = TRUE;
+
+    if ((n = parse_find_node("omnipresent", node))) {
+        gchar *s = parse_string(doc, n);
+        if (g_ascii_strcasecmp(s, "toggle")) {
+            o->toggle = FALSE;
+            o->on = parse_bool(doc, n);
+        }
+        g_free(s);
+    }
+
+    return o;
+}
+
+static void free_func(gpointer options)
+{
+    Options *o = options;
+
+    g_free(o);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    Options *o = options;
+
+    if (data->client)
+        if (o->toggle || (o->on != (data->client->desktop == DESKTOP_ALL)))
+            client_set_desktop(data->client,
+                               data->client->desktop == DESKTOP_ALL ?
+                               screen_desktop : DESKTOP_ALL, FALSE, TRUE);
+
+    return FALSE;
+}