use ob_debug for any debug printing and only display the output when its a debug...

[chaz/openbox] / openbox / menu.c

diff --git a/openbox/menu.c b/openbox/menu.c
index c953708bbd9ea5659fe4aabccddc5496523a14db..fabfc85ab449f2f9e163763acd064fb0e5e8754d 100644 (file)
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -1,3 +1,4 @@
+#include "debug.h"
 #include "menu.h"
 #include "openbox.h"
 #include "stacking.h"
@@ -37,14 +38,13 @@ void parse_menu_full(xmlDocPtr doc, xmlNodePtr node, void *data,
             goto parse_menu_fail;
         if (!parse_attr_string("label", node, &title))
             goto parse_menu_fail;
-        g_message("menu label %s", title);
+        ob_debug("menu label %s\n", title);
 
         if (parse_attr_string("plugin", node, &plugin)) {
-            PluginMenuCreateData data = {
-                .doc = doc,
-                .node = node,
-                .parent = menu
-            };
+            PluginMenuCreateData data;
+            data.doc = doc;
+            data.node = node;
+            data.parent = menu;
             parent = plugin_create(plugin, &data);
             g_free(plugin);
         } else
@@ -367,9 +367,19 @@ void menu_hide(ObMenu *self) {
         self->shown = FALSE;
        if (self->open_submenu)
            menu_hide(self->open_submenu);
-       if (self->parent && self->parent->open_submenu == self)
+       if (self->parent && self->parent->open_submenu == self) {
+            ObMenuEntry *e;
+
            self->parent->open_submenu = NULL;
 
+            e = menu_find_entry_by_submenu(self->parent, self);
+            if (self->parent->mouseover)
+                self->parent->mouseover(e, FALSE);
+            else
+                menu_control_mouseover(e, FALSE);
+            menu_entry_render(e);
+        }
+
         if (!(self->parent && self->parent->shown)) {
             grab_keyboard(FALSE);
             grab_pointer(FALSE, None);
@@ -422,7 +432,8 @@ ObMenuEntry *menu_find_entry_by_pos(ObMenu *menu, int x, int y)
     y -= menu->title_h + ob_rr_theme->bwidth;
     if (y < 0) return NULL;
     
-    g_message ("%d %p", y/menu->item_h, g_list_nth_data(menu->entries, y / menu->item_h));
+    ob_debug("%d %p\n", y/menu->item_h,
+             g_list_nth_data(menu->entries, y / menu->item_h));
     return g_list_nth_data(menu->entries, y / menu->item_h);
 }