From 78282959f970d28131e6aa8d66adce359aa145dc Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 7 Sep 2003 19:03:20 +0000 Subject: 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 --- openbox/client_list_menu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'openbox/client_list_menu.c') diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 2dab84fc..9b904f4d 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -40,7 +40,8 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) menu_add_separator(menu, -1); } - act = action_from_string("activate"); + act = action_from_string("Activate", + OB_USER_ACTION_MENU_SELECTION); act->data.activate.any.c = c; acts = g_slist_prepend(NULL, act); e = menu_add_normal(menu, i, @@ -56,16 +57,16 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data) } -/* executes it without changing the client in the actions, since we set that +/* executes it using the client in the actions, since we set that when we make the actions! */ -static void desk_menu_execute(ObMenuEntry *self, gpointer data) +static void desk_menu_execute(ObMenuEntry *self, guint state, gpointer data) { GSList *it; for (it = self->data.normal.actions; it; it = g_slist_next(it)) { ObAction *act = it->data; - act->func(&act->data); + action_run(it->data, act->data.any.c, state); } } -- cgit v1.2.3