*** ./data/menu.xsd	2008-01-11 17:09:51.000000000 +0100
--- ../../openbox-3.4.6.1/./data/menu.xsd	2008-03-25 14:54:05.000000000 +0100
***************
*** 46,51 ****
--- 46,52 ----
              </xs:element>
          </xs:sequence>
          <xs:attribute name="label" type="xs:string" use="required"/>
+ 	<xs:attribute name="icon" type="xs:string" use="optional"/>
      </xs:complexType>
      <!--
           simple types / restrictions
*** ./data/rc.xsd	2008-02-05 18:39:12.000000000 +0100
--- ../../openbox-3.4.6.1/./data/rc.xsd	2008-03-24 18:48:34.000000000 +0100
***************
*** 169,174 ****
--- 169,175 ----
          <xsd:element minOccurs="0" name="submenuShowDelay" type="xsd:integer"/>
          <xsd:element minOccurs="0" name="applicationIcons" type="ob:bool"/>
          <xsd:element minOccurs="0" name="manageDesktops" type="ob:bool"/>
+ 	<xsd:element minOccurs="0" name="showIcons" type="ob:bool"/>
      </xsd:complexType>
      <xsd:complexType name="window_position">
          <xsd:element name="x" type="ob:center_or_int"/>
*** ./Makefile.am	2008-02-05 18:34:56.000000000 +0100
--- ../../openbox-3.4.6.1/./Makefile.am	2008-03-25 15:39:02.000000000 +0100
***************
*** 143,148 ****
--- 143,149 ----
  	$(XML_LIBS) \
  	$(EFENCE_LIBS) \
  	$(LIBINTL) \
+ 	$(IMLIB2_LIBS) \
  	render/libobrender.la \
  	parser/libobparser.la
  openbox_openbox_LDFLAGS = -export-dynamic
*** ./openbox/menu.c	2008-02-05 18:29:46.000000000 +0100
--- ../../openbox-3.4.6.1/./openbox/menu.c	2008-03-25 21:23:00.000000000 +0100
***************
*** 36,41 ****
--- 36,42 ----
  #include "client_list_combined_menu.h"
  #include "gettext.h"
  #include "parser/parse.h"
+ #include <Imlib2.h>
  
  typedef struct _ObMenuParseState ObMenuParseState;
  
***************
*** 263,275 ****
--- 264,322 ----
      return shortcut;
  }
  
+ /* Load image data from file 'name' and attach it to menu entry 'e'.
+    The type of entry must be OB_MENU_ENTRY_TYPE_NORMAL.
+    No icon must be already specified. */
+ /* TODO: Implement some caching, so icons won't be loaded every time. */
+ static void menu_item_attach_icon(const gchar *name, ObMenuEntry *e)
+ {
+     g_assert(e->type == OB_MENU_ENTRY_TYPE_NORMAL);
+     g_assert(e->data.normal.icon_data == NULL);
+ 
+     Imlib_Image image = imlib_load_image(name);
+     if (image == NULL) {
+         g_message(_("Cannot load icon from file '%s'"), name);
+         return;
+     }
+ 
+     /* Get width and height of image, compute number (n) of pixels. */
+     imlib_context_set_image(image);
+     DATA32 *image_data = imlib_image_get_data_for_reading_only();
+     gint w = imlib_image_get_width();
+     gint h = imlib_image_get_height();
+     gint n = w * h;
+ 
+     /* Allocate a new block of memory and copy image data into it. */
+     RrPixel32 *icon_data = g_try_new(RrPixel32, n);
+     if (icon_data == NULL)
+         return;
+     /* XXX: Is Imlib2's format of DATA32 always identical to RrPixel32? */
+     memmove(icon_data, image_data, n * sizeof(RrPixel32));
+ 
+     e->data.normal.icon_width = w;
+     e->data.normal.icon_height = h;
+     e->data.normal.icon_alpha = 0xff;
+     e->data.normal.icon_data = icon_data;
+     e->data.normal.icon_free_on_destroy = TRUE;
+ 
+     imlib_free_image();
+ }
+ 
  static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
                              gpointer data)
  {
      ObMenuParseState *state = data;
      gchar *label;
+     gchar *icon;
+     ObMenuEntry *e;
  
      if (state->parent) {
+         /* Don't try to extract "icon" attribute if icons in user-defined
+ 	   menus are not enabled. */
+         if (!(config_menu_user_show_icons &&
+ 	    parse_attr_string("icon", node, &icon)))
+ 	       icon = NULL;
+ 
          if (parse_attr_string("label", node, &label)) {
              GSList *acts = NULL;
  
***************
*** 279,285 ****
                      if (a)
                          acts = g_slist_append(acts, a);
                  }
!             menu_add_normal(state->parent, -1, label, acts, TRUE);
              g_free(label);
          }
      }
--- 326,337 ----
                      if (a)
                          acts = g_slist_append(acts, a);
                  }
!             e = menu_add_normal(state->parent, -1, label, acts, TRUE);
! 
! 	    if (icon) { /* Icon will be used. */
! 		menu_item_attach_icon(icon, e);
! 	        g_free(icon);
! 	    }
              g_free(label);
          }
      }
***************
*** 511,516 ****
--- 563,573 ----
                      g_slist_delete_link(self->data.normal.actions,
                                          self->data.normal.actions);
              }
+ 
+ 	    /* Free icon data if neccessary. */
+ 	    if (self->data.normal.icon_free_on_destroy)
+ 	        g_free(self->data.normal.icon_data);
+ 
              break;
          case OB_MENU_ENTRY_TYPE_SUBMENU:
              g_free(self->data.submenu.name);
*** ./openbox/config.h	2008-02-05 18:39:12.000000000 +0100
--- ../../openbox-3.4.6.1/./openbox/config.h	2008-03-24 19:15:07.000000000 +0100
***************
*** 181,186 ****
--- 181,188 ----
  extern gboolean config_menu_client_list_icons;
  /*! Show manage desktops in client_list_menu */
  extern gboolean config_menu_manage_desktops;
+ /*! Load & show icons in user-defined menus */
+ extern gboolean config_menu_user_show_icons;
  /*! User-specified menu files */
  extern GSList *config_menu_files;
  /*! Per app settings */
*** ./openbox/config.c	2008-02-05 18:39:12.000000000 +0100
--- ../../openbox-3.4.6.1/./openbox/config.c	2008-03-25 21:22:10.000000000 +0100
***************
*** 90,95 ****
--- 90,96 ----
  guint    config_submenu_show_delay;
  gboolean config_menu_client_list_icons;
  gboolean config_menu_manage_desktops;
+ gboolean config_menu_user_show_icons;
  
  GSList *config_menu_files;
  
***************
*** 780,785 ****
--- 781,789 ----
              config_menu_client_list_icons = parse_bool(doc, n);
          if ((n = parse_find_node("manageDesktops", node)))
              config_menu_manage_desktops = parse_bool(doc, n);
+ 	/* Are icons in menus enabled or disabled? */
+ 	if ((n = parse_find_node("showIcons", node)))
+ 	    config_menu_user_show_icons = parse_bool(doc, n);
      }
  }
  
***************
*** 973,978 ****
--- 977,983 ----
      config_menu_client_list_icons = TRUE;
      config_menu_manage_desktops = TRUE;
      config_menu_files = NULL;
+     config_menu_user_show_icons = TRUE;
  
      parse_register(i, "menu", parse_menu, NULL);
  
*** ./openbox/menu.h	2008-02-05 18:29:46.000000000 +0100
--- ../../openbox-3.4.6.1/./openbox/menu.h	2008-03-25 17:55:10.000000000 +0100
***************
*** 121,126 ****
--- 121,127 ----
      gint icon_height;
      gint icon_alpha;
      RrPixel32 *icon_data;
+     gboolean icon_free_on_destroy;
  
      /* Mask icon */
      RrPixmapMask *mask;
*** ./configure.ac	2008-02-05 18:34:56.000000000 +0100
--- ../../openbox-3.4.6.1/./configure.ac	2008-03-25 15:23:26.000000000 +0100
***************
*** 86,91 ****
--- 86,95 ----
  AC_SUBST(XML_CFLAGS)
  AC_SUBST(XML_LIBS)
  
+ PKG_CHECK_MODULES(IMLIB2, [imlib2])
+ AC_SUBST(IMLIB2_CFLAGS)
+ AC_SUBST(IMLIB2_LIBS)
+ 
  AC_ARG_ENABLE(startup-notification,
    AC_HELP_STRING(
      [--disable-startup-notification],