move menu action back to ShowMenu

1 files changed, 48 insertions, 0 deletions

diff --git a/openbox/actions/showmenu.c b/openbox/actions/showmenu.c
new file mode 100644
index 00000000..a36648a2
--- /dev/null
+++ b/openbox/actions/showmenu.c
@@ -0,0 +1,48 @@
+#include "openbox/actions.h"
+#include "openbox/menu.h"
+#include <glib.h>
+
+typedef struct {
+    gchar   *name;
+} 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_showmenu_startup()
+{
+    actions_register("ShowMenu", 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("menu", node)))
+        o->name = parse_string(doc, n);
+    return o;
+}
+
+static void free_func(gpointer options)
+{
+    Options *o = options;
+    g_free(o->name);
+    g_free(o);
+}
+
+/* Always return FALSE because its not interactive */
+static gboolean run_func(ObActionsData *data, gpointer options)
+{
+    Options *o = options;
+
+    /* you cannot call ShowMenu from inside a menu */
+    if (data->uact != OB_USER_ACTION_MENU_SELECTION && o->name)
+        menu_show(o->name, data->x, data->y, data->button != 0, data->client);
+
+    return FALSE;
+}