diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-05-31 23:30:50 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-05-31 23:30:50 +0000 |
| commit | 2d9260f8c4d1f8cf89502d76bed60b93882ee2f1 (patch) | |
| tree | 16e4df1ef2796e539626857f597f4b0074fffd0e /openbox/event.c | |
| parent | 55886f27aa89a026563c918603b212f0dea8639b (diff) | |
make escape close the whole menu
Diffstat (limited to 'openbox/event.c')
| -rw-r--r-- | openbox/event.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/openbox/event.c b/openbox/event.c index 3d58775b..ad146b47 100644 --- a/openbox/event.c +++ b/openbox/event.c @@ -1584,13 +1584,8 @@ static gboolean event_handle_menu_keyboard(XEvent *ev) if (frame == NULL) ret = FALSE; - else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0) { - /* Escape goes to the parent menu or closes the last one */ - if (frame->parent) - menu_frame_select(frame, NULL, TRUE); - else - menu_frame_hide_all(); - } + else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0) + menu_frame_hide_all(); else if (keycode == ob_keycode(OB_KEY_RETURN) && (state == 0 || state == ControlMask)) |