From: Dana Jansens <danakj@orodu.net>
Date: Thu, 31 May 2007 23:30:50 +0000 (+0000)
Subject: make escape close the whole menu
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=2d9260f8c4d1f8cf89502d76bed60b93882ee2f1;p=chaz%2Fopenbox

make escape close the whole menu
---

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))