X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmenu.c;h=11d040092bb1b917a4247260309832610c080069;hb=78a8680cd7379cc0d75af810dabe62c7a6c4a8b2;hp=611a53bc897d1fddb0aadd0929a96b59122e1d87;hpb=81cc0749f8fe6e5a1f3474c07b26de2c49648526;p=chaz%2Fopenbox

diff --git a/openbox/menu.c b/openbox/menu.c
index 611a53bc..11d04009 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -92,13 +92,11 @@ void menu_startup()
 
     menu_add_entry(m, menu_entry_new_submenu("subz", s));
 
-    /*
     t = (Menu *)plugin_create("timed_menu");
     a = action_from_string("execute");
     a->data.execute.path = g_strdup("xeyes");
     menu_add_entry(t, menu_entry_new("xeyes", a));
     menu_add_entry(m, menu_entry_new_submenu("timed", t));
-    */
     
     s = menu_new("empty", "chub", m);
     menu_add_entry(m, menu_entry_new_submenu("empty", s));
@@ -121,7 +119,7 @@ void menu_startup()
     menu_add_entry(s, menu_entry_new("exit", a));
 
     menu_add_entry(m, menu_entry_new_submenu("long", s));
-
+    
     m = menu_new(NULL, "client", NULL);
     a = action_from_string("iconify");
     menu_add_entry(m, menu_entry_new("iconify", a));
@@ -201,6 +199,7 @@ Menu *menu_new_full(char *label, char *name, Menu *parent,
     g_hash_table_insert(menu_hash, g_strdup(name), self);
 
     stacking_add(self);
+    stacking_raise(MENU_AS_WINDOW(self));
 
     return self;
 }
@@ -311,6 +310,7 @@ void menu_clear(Menu *self) {
 	menu_entry_free(entry);
     }
     self->entries = NULL;
+    self->invalid = TRUE;
 }
 
 
@@ -356,9 +356,6 @@ void menu_control_show(Menu *self, int x, int y, Client *client) {
 	      MIN(y, screen_physical_size.height - self->size.height));
 
     if (!self->shown) {
-        /* XXX gotta add to the stacking list first!
-           stacking_raise(MENU_AS_WINDOW(self));
-        */
 	XMapWindow(ob_display, self->frame);
         stacking_raise(MENU_AS_WINDOW(self));
 	self->shown = TRUE;