add the desktop action

4 files changed, 52 insertions, 25 deletions

diff --git a/openbox/action.c b/openbox/action.c
index 2dca0dd5..58a0e61f 100644
--- a/openbox/action.c
+++ b/openbox/action.c
@@ -162,13 +162,6 @@ void setup_action_send_to_desktop_down(ObAction **a, ObUserAction uact)
     (*a)->data.sendtodir.follow = TRUE;
 }
 
-void setup_action_desktop(ObAction **a, ObUserAction uact)
-{
-/*
-    (*a)->data.desktop.inter.any.interactive = FALSE;
-*/
-}
-
 void setup_action_desktop_prev(ObAction **a, ObUserAction uact)
 {
     (*a)->data.desktopdir.inter.any.interactive = TRUE;
@@ -398,11 +391,6 @@ ActionString actionstrings[] =
         setup_action_send_to_desktop_down
     },
     {
-        "desktop",
-        action_desktop,
-        setup_action_desktop
-    },
-    {
         "desktopnext",
         action_desktop_dir,
         setup_action_desktop_next
@@ -821,19 +809,6 @@ void action_send_to_desktop(union ActionData *data)
     }
 }
 
-void action_desktop(union ActionData *data)
-{
-    /* XXX add the interactive/dialog option back again once the dialog
-       has been made to not use grabs */
-    if (data->desktop.desk < screen_num_desktops ||
-        data->desktop.desk == DESKTOP_ALL)
-    {
-        screen_set_desktop(data->desktop.desk, TRUE);
-        if (data->inter.any.interactive)
-            screen_desktop_popup(data->desktop.desk, TRUE);
-    }
-}
-
 void action_desktop_dir(union ActionData *data)
 {
     guint d;
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;
+}