diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-07-13 17:14:33 -0400 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-07-13 17:14:33 -0400 |
| commit | 6689ad2320ecb7856f5277acb73b6df213fa98c4 (patch) | |
| tree | 403299ac9bd1da3cd1bffa3b288a6db2049ac0da /openbox/actions/menu.c | |
| parent | c6f2875d61ce038bcc3b28e28aa26a0648efd752 (diff) | |
move menu action back to ShowMenu
Diffstat (limited to 'openbox/actions/menu.c')
| -rw-r--r-- | openbox/actions/menu.c | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/openbox/actions/menu.c b/openbox/actions/menu.c deleted file mode 100644 index 64a4d279..00000000 --- a/openbox/actions/menu.c +++ /dev/null @@ -1,57 +0,0 @@ -#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_menu_startup() -{ - actions_register("Menu", - 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; - - if (o) { - 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) return FALSE; - - if (o->name) { - menu_show(o->name, data->x, data->y, data->button != 0, data->client); - } - - return FALSE; -} |
