add the desktop action

3 files changed, 52 insertions, 0 deletions

diff --git a/openbox/actions/all.c b/openbox/actions/all.c
index 78bcb804..3fb4f816 100644
--- a/openbox/actions/all.c
+++ b/openbox/actions/all.c
@@ -32,4 +32,5 @@ void action_all_startup()
     action_directionaltargetwindow_startup();
     action_resize_startup();
     action_decorations_startup();
+    action_desktop_startup();
 }
diff --git a/openbox/actions/all.h b/openbox/actions/all.h
index b9ae7f43..290c8f14 100644
--- a/openbox/actions/all.h
+++ b/openbox/actions/all.h
@@ -33,5 +33,6 @@ void action_directionalcyclewindows_startup();
 void action_directionaltargetwindow_startup();
 void action_resize_startup();
 void action_decorations_startup();
+void action_desktop_startup();
 
 #endif
diff --git a/openbox/actions/desktop.c b/openbox/actions/desktop.c
new file mode 100644
index 00000000..7461d849
--- /dev/null
+++ b/openbox/actions/desktop.c
@@ -0,0 +1,50 @@
+#include "openbox/actions.h"
+#include "openbox/screen.h"
+#include <glib.h>
+
+typedef struct {
+    guint desktop;
+} 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_desktop_startup()
+{
+    actions_register("desktop",
+                     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);
+
+    if ((n = parse_find_node("desktop", node)))
+        o->desktop = parse_int(doc, n) - 1;
+    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 (o->desktop < screen_num_desktops)
+        screen_set_desktop(o->desktop, TRUE);
+
+    return FALSE;
+}