Close menu properly on unbound keys.

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index 7220c37b487183bfdd0ec076e10f78b788c7c3f0..99043cd52caeca139a0084999e6fab6fc9977a59 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -45,7 +45,9 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
             data.doc = doc;
             data.node = node;
             data.parent = menu;
-            parent = plugin_create(plugin, &data);
+
+            if (plugin_open_reopen(plugin))
+                parent = plugin_create(plugin, &data);
             g_free(plugin);
         } else
             menu = menu_new(title, id, data ? *((ObMenu**)data) : NULL);
@@ -65,7 +67,8 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
                 data.doc = doc;
                 data.node = node;
                 data.parent = menu;
-                parent = plugin_create(plugin, &data);
+                if (plugin_open_reopen(plugin))
+                    parent = plugin_create(plugin, &data);
                 g_free(plugin);
             } else {
                 parent = menu;
@@ -297,7 +300,7 @@ void menu_show_full(ObMenu *self, int x, int y, ObClient *client)
 {
     g_assert(self != NULL);
        
-    menu_render(self);
+    self->update(self);
     
     self->client = client;
 
@@ -317,9 +320,8 @@ void menu_hide(ObMenu *self) {
         XUnmapWindow(ob_display, self->frame);
         self->shown = FALSE;
        if (self->open_submenu)
-           menu_hide(self->open_submenu);
+           self->open_submenu->hide(self->open_submenu);
        if (self->parent && self->parent->open_submenu == self) {
-            self->over = NULL;
            self->parent->open_submenu = NULL;
         }
 
@@ -328,6 +330,11 @@ void menu_hide(ObMenu *self) {
             grab_pointer(FALSE, None);
         }
         menu_visible = g_list_remove(menu_visible, self);
+        if (self->over) {
+            ((ObMenuEntry *)self->over->data)->hilite = FALSE;
+            menu_entry_render(self->over->data);
+            self->over = NULL;
+        }
     }
 }
 
@@ -394,7 +401,7 @@ void menu_entry_fire(ObMenuEntry *self, unsigned int button, unsigned int x,
         /* hide the whole thing */
         m = self->parent;
         while (m->parent) m = m->parent;
-        menu_hide(m);
+        m->hide(m);
     }
 }
 
@@ -427,7 +434,7 @@ void menu_control_show(ObMenu *self, int x, int y, ObClient *client)
         stacking_raise(MENU_AS_WINDOW(self));
        self->shown = TRUE;
     } else if (self->shown && self->open_submenu) {
-       menu_hide(self->open_submenu);
+       self->open_submenu->hide(self->open_submenu);
     }
 }
 
@@ -447,7 +454,7 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
             e = (ObMenuEntry *) self->parent->over->data;
             e->hilite = FALSE;
             menu_entry_render(e);
-           menu_hide(self->parent->open_submenu);
+           self->parent->open_submenu->hide(self->parent->open_submenu);
         }
        
        if (self->submenu && self->parent->open_submenu != self->submenu) {
@@ -461,7 +468,7 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
                ob_rr_theme->bwidth - ob_rr_theme->menu_overlap;
 
            /* need to get the width. is this bad?*/
-           menu_render(self->submenu);
+           self->parent->update(self->submenu);
 
             a = screen_physical_area_monitor(self->parent->xin_area);
 
@@ -485,6 +492,7 @@ void menu_control_mouseover(ObMenuEntry *self, gboolean enter)
 void menu_control_keyboard_nav(unsigned int key)
 {
     static ObMenu *current_menu = NULL;
+    ObMenuEntry *e = NULL;
 
     ObKey obkey = OB_NUM_KEYS;
 
@@ -497,6 +505,9 @@ void menu_control_keyboard_nav(unsigned int key)
         obkey = OB_KEY_RIGHT;
     else if (key == ob_keycode(OB_KEY_LEFT)) /* users */
         obkey = OB_KEY_LEFT;
+    else if (key == ob_keycode(OB_KEY_RETURN))
+        obkey = OB_KEY_RETURN;
+
     
     if (current_menu == NULL)
         current_menu = menu_visible->data;
@@ -532,32 +543,37 @@ void menu_control_keyboard_nav(unsigned int key)
         break;
     }
     case OB_KEY_RIGHT: {
-        ObMenuEntry *e;
         if (current_menu->over == NULL)
             return;
-
         e = (ObMenuEntry *)current_menu->over->data;
         if (e->submenu) {
+            current_menu->mouseover(e, TRUE);
             current_menu = e->submenu;
             current_menu->over = current_menu->entries;
             if (current_menu->over)
                 current_menu->mouseover(current_menu->over->data, TRUE);
-        } else {
-            current_menu->mouseover(e, FALSE);
-            current_menu->over = NULL;
-            
-            /* zero is enter */
-            menu_entry_fire(e, 0, 0, 0);
         }
         break;
     }
+
+    case OB_KEY_RETURN: {
+        if (current_menu->over == NULL)
+            return;
+        e = (ObMenuEntry *)current_menu->over->data;
+
+        current_menu->mouseover(e, FALSE);
+        current_menu->over = NULL;
+        /* zero is enter */
+        menu_entry_fire(e, 0, 0, 0);
+    }
+        
     case OB_KEY_LEFT: {
         if (current_menu->over != NULL) {
             current_menu->mouseover(current_menu->over->data, FALSE);
             current_menu->over = NULL;
         }
         
-        menu_hide(current_menu);
+        current_menu->hide(current_menu);
 
         if (current_menu->parent)
             current_menu = current_menu->parent;
@@ -565,8 +581,7 @@ void menu_control_keyboard_nav(unsigned int key)
         break;
     }
     default:
-        if (current_menu)
-            menu_hide(current_menu);
+        ((ObMenu *)menu_visible->data)->hide(menu_visible->data);
     }
     return;
 }