diff options
| -rw-r--r-- | data/rc.xml.in | 1 | ||||
| -rw-r--r-- | data/rc.xsd | 4 | ||||
| -rw-r--r-- | openbox/client_list_menu.c | 2 | ||||
| -rw-r--r-- | openbox/config.c | 4 | ||||
| -rw-r--r-- | openbox/config.h | 2 |
5 files changed, 12 insertions, 1 deletions
diff --git a/data/rc.xml.in b/data/rc.xml.in index 58c6b42d..b07a8cdc 100644 --- a/data/rc.xml.in +++ b/data/rc.xml.in @@ -54,6 +54,7 @@ <floatingY>0</floatingY> <autoHide>no</autoHide> <hideDelay>300</hideDelay> + <desktopMenuIcons>yes</desktopMenuIcons> <moveButton>A-Left</moveButton> </dock> diff --git a/data/rc.xsd b/data/rc.xsd index 9f992ed7..b5b40f2d 100644 --- a/data/rc.xsd +++ b/data/rc.xsd @@ -28,6 +28,9 @@ update hideTimeout to hideDelay Thu Apr 22 12:33:11 UTC 2004 - mikachu(a)openbox.org add diffs between 3.1 and 3.2 + Sun Oct 31 10:08:34 UTC 2004 - mikachu(a)openbox.org + we haven't remembered to update this changelog in a while, + adding desktopMenuIcons. --> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://openbox.org/" @@ -124,6 +127,7 @@ <xs:element name="floatingY" type="xs:integer"/> <xs:element name="autoHide" type="ob:yesorno"/> <xs:element name="hideDelay" type="xs:integer"/> + <xs:element name="disktopMenuIcons" type="ob:yesorno"/> <xs:element name="moveButton" type="ob:button"/> </xs:sequence> </xs:complexType> 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; |