all repos — openbox @ 10805a47644f9b7eb01528287c3281232e9187d0

openbox fork - make it a bit more like ryudo 

config option for icons in desktop menus
Mikael Magnusson mikachu@comhem.se
commit

10805a47644f9b7eb01528287c3281232e9187d0

parent

b27343a314efa7f42510beaee2c7260a54bbf7ac

5 files changed, 12 insertions(+), 1 deletions(-)

jump to
M data/rc.xml.in → data/rc.xml.in 
@@ -54,6 +54,7 @@ <floatingX>0</floatingX>
   <floatingY>0</floatingY>
   <autoHide>no</autoHide>
   <hideDelay>300</hideDelay>
+  <desktopMenuIcons>yes</desktopMenuIcons>
   <moveButton>A-Left</moveButton>
 </dock>
M data/rc.xsd → data/rc.xsd 
@@ -28,6 +28,9 @@ Mon Sep 22 14:08:16 EDT 2003 - xor(a)orodu.net
          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="floatingX" type="xs:integer"/>
             <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>
M openbox/client_list_menu.c → openbox/client_list_menu.c 
@@ -73,7 +73,7 @@ acts = g_slist_append(acts, act);
             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;
M openbox/config.c → openbox/config.c 
@@ -66,6 +66,7 @@ 
 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 @@ if ((n = parse_find_node("xorStyle", 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 @@ 
     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);
M openbox/config.h → openbox/config.h 
@@ -113,6 +113,8 @@ /*! make menus jump around a lot */
 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;