This patch implements support for icons in user-defined menus into Openbox

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 92445517b77b708d0b434ca10d468142c7152961..304079c96afde1f08a2162e0c8edfcef424b95f0 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -93,8 +93,10 @@ gint config_mouse_screenedgetime;
 guint    config_menu_hide_delay;
 gboolean config_menu_middle;
 guint    config_submenu_show_delay;
+guint    config_submenu_hide_delay;
 gboolean config_menu_client_list_icons;
 gboolean config_menu_manage_desktops;
+gboolean config_menu_user_show_icons;
 
 GSList *config_menu_files;
 
@@ -813,10 +815,20 @@ static void parse_menu(xmlNodePtr node, gpointer d)
         config_menu_middle = obt_xml_node_bool(n);
     if ((n = obt_xml_find_node(node, "submenuShowDelay")))
         config_submenu_show_delay = obt_xml_node_int(n);
+    if ((n = obt_xml_find_node(node, "submenuHideDelay")))
+        config_submenu_hide_delay = obt_xml_node_int(n);
     if ((n = obt_xml_find_node(node, "applicationIcons")))
         config_menu_client_list_icons = obt_xml_node_bool(n);
     if ((n = obt_xml_find_node(node, "manageDesktops")))
         config_menu_manage_desktops = obt_xml_node_bool(n);
+    if ((n = obt_xml_find_node(node, "showIcons"))) {
+        config_menu_user_show_icons = obt_xml_node_bool(n);
+        #ifndef USE_IMLIB2
+        if (config_menu_user_show_icons)
+            g_message(_("Openbox was compiled without Imlib2."
+                      " Icons in user-defined menus will NOT be loaded."));
+        #endif
+    }
 
     while ((node = obt_xml_find_node(node, "file"))) {
             gchar *c = obt_xml_node_string(node);
@@ -1017,10 +1029,12 @@ void config_startup(ObtXmlInst *i)
 
     config_menu_hide_delay = 250;
     config_menu_middle = FALSE;
-    config_submenu_show_delay = 0;
+    config_submenu_show_delay = 200;
+    config_submenu_hide_delay = 400;
     config_menu_client_list_icons = TRUE;
     config_menu_manage_desktops = TRUE;
     config_menu_files = NULL;
+    config_menu_user_show_icons = TRUE;
 
     obt_xml_register(i, "menu", parse_menu, NULL);