diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-09-07 19:03:20 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-09-07 19:03:20 +0000 |
| commit | 78282959f970d28131e6aa8d66adce359aa145dc (patch) | |
| tree | 57508152b85c3442d1b0c683497bbc12a7f5dff0 /openbox/event.c | |
| parent | b23594d88d462f4ed1b0a26b5e303f491758f5ff (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/event.c')
| -rw-r--r-- | openbox/event.c | 6 |
1 files changed, 2 insertions, 4 deletions
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) |