little bit of an actions overhaul, added action_run* so that duplicated code can...

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index e5f8d45ca5193281a9b8f7268d17fb934787c7cf..a9841b0e142f2c814035a579fc248b699a030dc2 100644 (file)
--- 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)