config option for icons in desktop menus

[chaz/openbox] / openbox / config.c

diff --git a/openbox/config.c b/openbox/config.c
index 151fdf4513ac36f7c246a5863391682dd9464b7a..f9fae2bfef3265fe96217c787fc6c7081c19b2a4 100644 (file)
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -65,14 +65,16 @@ gint config_mouse_dclicktime;
 
 gboolean config_menu_warppointer;
 gboolean config_menu_xorstyle;
-gboolean config_menu_hilightfirst;
 guint    config_menu_hide_delay;
+gboolean config_menu_client_list_icons;
 
 GSList *config_menu_files;
 
 gint config_resist_win;
 gint config_resist_edge;
 
+gboolean config_resist_layers_below;
+
 /*
 
 <keybind key="C-x">
@@ -405,10 +407,10 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             config_menu_warppointer = parse_bool(doc, n);
         if ((n = parse_find_node("xorStyle", node)))
             config_menu_xorstyle = parse_bool(doc, n);
-        if ((n = parse_find_node("hilightFirst", node)))
-            config_menu_hilightfirst = parse_bool(doc, n);
         if ((n = parse_find_node("hideDelay", node)))
             config_menu_hide_delay = parse_int(doc, n);
+        if ((n = parse_find_node("desktopMenuIcons", node)))
+            config_menu_client_list_icons = parse_int(doc, n);
     }
 }
    
@@ -422,6 +424,8 @@ static void parse_resistance(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
         config_resist_win = parse_int(doc, n);
     if ((n = parse_find_node("screen_edge_strength", node)))
         config_resist_edge = parse_int(doc, n);
+    if ((n = parse_find_node("edges_hit_layers_below", node)))
+        config_resist_layers_below = parse_bool(doc, n);
 }
 
 typedef struct
@@ -589,13 +593,14 @@ void config_startup(ObParseInst *i)
 
     config_resist_win = 10;
     config_resist_edge = 20;
+    config_resist_layers_below = FALSE;
 
     parse_register(i, "resistance", parse_resistance, NULL);
 
     config_menu_warppointer = TRUE;
-    config_menu_xorstyle = FALSE;
-    config_menu_hilightfirst = TRUE;
+    config_menu_xorstyle = TRUE;
     config_menu_hide_delay = 250;
+    config_menu_client_list_icons = TRUE;
     config_menu_files = NULL;
 
     parse_register(i, "menu", parse_menu, NULL);