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/menuframe.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'openbox/menuframe.c') diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 7b758d30..f2a14e48 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -711,7 +711,7 @@ void menu_entry_frame_show_submenu(ObMenuEntryFrame *self) menu_frame_show(f, self->frame); } -void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide) +void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state) { if (self->entry->type == OB_MENU_ENTRY_TYPE_NORMAL && self->entry->data.normal.enabled) @@ -725,31 +725,16 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, gboolean hide) ObClient *client = self->frame->client; /* release grabs before executing the shit */ - if (hide) + if (!(state & ControlMask)) menu_frame_hide_all(); if (func) - func(entry, data); + func(entry, state, data); else { GSList *it; for (it = acts; it; it = g_slist_next(it)) - { - ObAction *act = it->data; - act->data.any.c = client; - - if (act->func == action_moveresize) - screen_pointer_pos(&act->data.moveresize.x, - &act->data.moveresize.y); - - if (!(act->func == action_cycle_windows || - act->func == action_desktop_dir || - act->func == action_send_to_desktop_dir || - act->func == action_showmenu)) - { - act->func(&act->data); - } - } + action_run(it->data, client, state); } } } -- cgit v1.2.3