summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@comhem.se>2004-10-31 10:10:33 +0000
committerMikael Magnusson <mikachu@comhem.se>2004-10-31 10:10:33 +0000
commit10805a47644f9b7eb01528287c3281232e9187d0 (patch)
treea89ab6b703fbccc9714af8d3efb4faf2bb2c6d3c /openbox
parentb27343a314efa7f42510beaee2c7260a54bbf7ac (diff)
config option for icons in desktop menus
Diffstat (limited to 'openbox')
-rw-r--r--openbox/client_list_menu.c2
-rw-r--r--openbox/config.c4
-rw-r--r--openbox/config.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c
index a1dc266c..fd14a96d 100644
--- a/openbox/client_list_menu.c
+++ b/openbox/client_list_menu.c
@@ -73,7 +73,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
e = menu_add_normal(menu, i,
(c->iconic ? c->icon_title : c->title), acts);
- if ((icon = client_icon(c, 32, 32))) {
+ if (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) {
e->data.normal.icon_width = icon->width;
e->data.normal.icon_height = icon->height;
e->data.normal.icon_data = icon->data;
diff --git a/openbox/config.c b/openbox/config.c
index 768cc600..f9fae2bf 100644
--- a/openbox/config.c
+++ b/openbox/config.c
@@ -66,6 +66,7 @@ gint config_mouse_dclicktime;
gboolean config_menu_warppointer;
gboolean config_menu_xorstyle;
guint config_menu_hide_delay;
+gboolean config_menu_client_list_icons;
GSList *config_menu_files;
@@ -408,6 +409,8 @@ static void parse_menu(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
config_menu_xorstyle = 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);
}
}
@@ -597,6 +600,7 @@ void config_startup(ObParseInst *i)
config_menu_warppointer = 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);
diff --git a/openbox/config.h b/openbox/config.h
index c7df90f0..13255108 100644
--- a/openbox/config.h
+++ b/openbox/config.h
@@ -113,6 +113,8 @@ extern gboolean config_menu_warppointer;
extern gboolean config_menu_xorstyle;
/*! delay for hiding menu when opening */
extern guint config_menu_hide_delay;
+/*! show icons in client_list_menu */
+extern gboolean config_menu_client_list_icons;
/*! User-specified menu files */
extern GSList *config_menu_files;