fix escape's behavior in menus. make static stuff that shouldnt be used by others

diff --git a/openbox/event.c b/openbox/event.c
index 8f21120248af2e5d6ee7f8eb0e5e7208990cbd2d..ace548a6498fbe3b877ed4469cf9740cb3dc9d44 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -1482,8 +1482,11 @@ static gboolean event_handle_menu_keyboard(XEvent *ev)
         ret = FALSE;
 
     else if (keycode == ob_keycode(OB_KEY_ESCAPE) && state == 0) {
-        /* Escape closes the active menu */
-        menu_frame_hide(frame);
+        /* 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_RETURN) && (state == 0 ||

diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 68ea49496a992b29750b70665f79b2dff84abaf8..b908ad4ff0a6be146562d62a0265c0c6ef24d26f 100644 (file)
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -45,6 +45,7 @@ static ObMenuEntryFrame* menu_entry_frame_new(ObMenuEntry *entry,
 static void menu_entry_frame_free(ObMenuEntryFrame *self);
 static void menu_frame_update(ObMenuFrame *self);
 static gboolean menu_entry_frame_submenu_timeout(gpointer data);
+static void menu_frame_hide(ObMenuFrame *self);
 
 static Window createWindow(Window parent, gulong mask,
                            XSetWindowAttributes *attrib)
@@ -1013,7 +1014,7 @@ gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
     return TRUE;
 }
 
-void menu_frame_hide(ObMenuFrame *self)
+static void menu_frame_hide(ObMenuFrame *self)
 {
     GList *it = g_list_find(menu_frame_visible, self);
 

diff --git a/openbox/menuframe.h b/openbox/menuframe.h
index 4f896ec88fbf965cf057ab35400f5479c9473a50..e1f4b15bfe03b4ddd3b355f883731e5b1ffcbf99 100644 (file)
--- a/openbox/menuframe.h
+++ b/openbox/menuframe.h
@@ -128,7 +128,6 @@ gboolean menu_frame_show_topmenu(ObMenuFrame *self, gint x, gint y,
                                  gint button);
 gboolean menu_frame_show_submenu(ObMenuFrame *self, ObMenuFrame *parent,
                                  ObMenuEntryFrame *parent_entry);
-void menu_frame_hide(ObMenuFrame *self);
 
 void menu_frame_hide_all();
 void menu_frame_hide_all_client(struct _ObClient *client);