This patch implements support for icons in user-defined menus into Openbox

Image loading is done using the Imlib2 library.
I chose Imlib2 because it's pretty fast, it's easy to use, supports many file
formats (tested xpm, gif, jpeg, png) and doesn't introduce too much bloat (it
depends :)).

I ported the patch to 3.4.7-pre3 and added some enhancements. Caching is much
better now, and icons can be disabled at compile time using --disable-imlib2
option.

What's new?
Syntax of configuration files (namely rc.xml and menu.xml) has been changed
slightly to allow users to associate icons to menu entries. This is done by
specifying path to icon file in the new "icon" attribute in "<item>" element,
e.g:
<item label="Vim" icon="/usr/share/pixmaps/vim-32.xpm">
  <action name="Execute"><execute>x-terminal-emulator -T Vim -e
vim</execute></action>
</item>

If user doesn't want to display any icons in his user-defined menus, he/she can
disable icons in rc.xml, inside "<menu>" section:
<menu>
 ...
  <showIcons>no</showIcons>
 ...
</menu>
Default value is "yes".
(New boolean variable "config_menu_user_show_icons" has been added to source
code.)

An icon is loaded (using menu_item_attach_icon()) when a new entry of menu is
created. Fortunately, I haven't notice any performance problems because of this
:).

1 files changed, 24 insertions, 0 deletions

diff --git a/openbox/menu.c b/openbox/menu.c
index fcf5d168..f53e4f0b 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -36,6 +36,7 @@
 #include "gettext.h"
 #include "obt/xml.h"
 #include "obt/paths.h"
+#include "imageload.h"
 
 typedef struct _ObMenuParseState ObMenuParseState;
 
@@ -269,8 +270,20 @@ static void parse_menu_item(xmlNodePtr node,  gpointer data)
 {
     ObMenuParseState *state = data;
     gchar *label;
+    #ifdef USE_IMLIB2
+    gchar *icon;
+    #endif
+    ObMenuEntry *e;
 
     if (state->parent) {
+        #ifdef USE_IMLIB2
+        /* Don't try to extract "icon" attribute if icons in user-defined
+	   menus are not enabled. */
+        if (!(config_menu_user_show_icons &&
+            obt_xml_attr_string(node, "icon", &icon)))
+               icon = NULL;
+        #endif
+
         if (obt_xml_attr_string(node, "label", &label)) {
             GSList *acts = NULL;
 
@@ -281,8 +294,19 @@ static void parse_menu_item(xmlNodePtr node,  gpointer data)
                     acts = g_slist_append(acts, action);
                 node = obt_xml_find_node(node->next, "action");
             }
+            e = menu_add_normal(state->parent, -1, label, acts, TRUE);
+            
+            #ifdef USE_IMLIB2
+            if (icon) { /* Icon will be used. */
+                e->data.normal.icon = RrImageFetchFromFile(ob_rr_icons, icon);
+                if (e->data.normal.icon) {
+                    e->data.normal.icon_alpha = 0xff;
+                }
+                g_free(icon);
+            }
 
             menu_add_normal(state->parent, -1, label, acts, TRUE);
+            #endif
             g_free(label);
         }
     }