summaryrefslogtreecommitdiff
path: root/openbox/menu.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-07 19:03:20 +0000
committerDana Jansens <danakj@orodu.net>2003-09-07 19:03:20 +0000
commit78282959f970d28131e6aa8d66adce359aa145dc (patch)
tree57508152b85c3442d1b0c683497bbc12a7f5dff0 /openbox/menu.c
parentb23594d88d462f4ed1b0a26b5e303f491758f5ff (diff)
little bit of an actions overhaul, added action_run* so that duplicated code can all be in the same place now woot.
allow actions to specify when they can be used (ShowMenu cant in the OB_USER_ACTION_MENU_SELECTION case) remove KeyboardMove ad KeyboardResize. Instead, just use Move and Resize and determine if it should be a keyboard move/resize in the code
Diffstat (limited to 'openbox/menu.c')
-rw-r--r--openbox/menu.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/openbox/menu.c b/openbox/menu.c
index 39e19246..74a743ee 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -180,7 +180,9 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
for (node = node->xmlChildrenNode; node; node = node->next)
if (!xmlStrcasecmp(node->name, (const xmlChar*) "action"))
- acts = g_slist_append(acts, action_parse(i, doc, node));
+ acts = g_slist_append(acts, action_parse
+ (i, doc, node,
+ OB_USER_ACTION_MENU_SELECTION));
menu_add_normal(state->parent, -1, label, acts);
g_free(label);
}