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/event.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'openbox/event.c') diff --git a/openbox/event.c b/openbox/event.c index e5f8d45c..a9841b0e 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1126,8 +1126,7 @@ static void event_handle_menu(XEvent *ev) else { if ((e = menu_entry_frame_under(ev->xbutton.x_root, ev->xbutton.y_root))) - menu_entry_frame_execute(e, - !(ev->xbutton.state & ControlMask)); + menu_entry_frame_execute(e, ev->xbutton.state); } break; case MotionNotify: @@ -1145,8 +1144,7 @@ static void event_handle_menu(XEvent *ev) else if (ev->xkey.keycode == ob_keycode(OB_KEY_RETURN)) { ObMenuFrame *f; if ((f = find_active_menu())) - menu_entry_frame_execute(f->selected, - !(ev->xkey.state & ControlMask)); + menu_entry_frame_execute(f->selected, ev->xkey.state); } else if (ev->xkey.keycode == ob_keycode(OB_KEY_LEFT)) { ObMenuFrame *f; if ((f = find_active_menu()) && f->parent) -- cgit v1.2.3