NOW IN MIT/X LICENSE

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index a80876d..931d3fe 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -13,6 +13,7 @@
 #include <X11/Xresource.h>
 #include <X11/XKBlib.h>
 #include <X11/Xft/Xft.h>
 #include <X11/Xresource.h>
 #include <X11/XKBlib.h>
 #include <X11/Xft/Xft.h>

+#include <X11/extensions/Xinerama.h>

 #include <Imlib2.h>
 #include "xmenu.h"
 
 #include <Imlib2.h>
 #include "xmenu.h"
 


@@ -21,14 +22,15 @@
  */
 
 /* argument parser */
  */
 
 /* argument parser */

-static void parseposition(const char *optarg);
+static void parseposition(char *optarg);

 
 /* initializers, and their helper routines */
 static void parsefonts(const char *s);
 static void ealloccolor(const char *s, XftColor *color);
 
 /* initializers, and their helper routines */
 static void parsefonts(const char *s);
 static void ealloccolor(const char *s, XftColor *color);

+static void initmonitor(void);

 static void initresources(void);
 static void initdc(void);
 static void initresources(void);
 static void initdc(void);

-static void initconfig(void);
+static void initiconsize(void);

 static void initatoms(void);
 
 /* structure builders, and their helper routines */
 static void initatoms(void);
 
 /* structure builders, and their helper routines */


@@ -39,6 +41,7 @@ static struct Menu *parsestdin(void);
 
 /* text drawer, and its helper routine */
 static FcChar32 getnextutf8char(const char *s, const char **end_ret);
 
 /* text drawer, and its helper routine */
 static FcChar32 getnextutf8char(const char *s, const char **end_ret);

+static XftFont *getfontucode(FcChar32 ucode);

 static int drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text);
 
 /* structure setters, and their helper routines */
 static int drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text);
 
 /* structure setters, and their helper routines */


@@ -87,13 +90,15 @@ static Visual *visual;
 static Window rootwin;
 static Colormap colormap;
 static struct DC dc;
 static Window rootwin;
 static Colormap colormap;
 static struct DC dc;

+static struct Monitor mon;

 static Atom utf8string;
 static Atom wmdelete;
 static Atom netatom[NetLast];
 
 /* flags */
 static int iflag = 0;   /* whether to disable icons */
 static Atom utf8string;
 static Atom wmdelete;
 static Atom netatom[NetLast];
 
 /* flags */
 static int iflag = 0;   /* whether to disable icons */

-static int pflag = 0;   /* whether the user specified a position */
+static int mflag = 0;   /* whether the user specified a monitor with -p */
+static int pflag = 0;   /* whether the user specified a position with -p */

 static int wflag = 0;   /* whether to let the window manager control XMenu */
 
 /* include config variable */
 static int wflag = 0;   /* whether to let the window manager control XMenu */
 
 /* include config variable */


@@ -137,7 +142,7 @@ main(int argc, char *argv[])
 
        /* open connection to server and set X variables */
        if ((dpy = XOpenDisplay(NULL)) == NULL)
 
        /* open connection to server and set X variables */
        if ((dpy = XOpenDisplay(NULL)) == NULL)

-               errx(1, "cannot open display");
+               errx(1, "could not open display");

        screen = DefaultScreen(dpy);
        visual = DefaultVisual(dpy, screen);
        rootwin = RootWindow(dpy, screen);
        screen = DefaultScreen(dpy);
        visual = DefaultVisual(dpy, screen);
        rootwin = RootWindow(dpy, screen);


@@ -153,9 +158,10 @@ main(int argc, char *argv[])
        }
 
        /* initializers */
        }
 
        /* initializers */

+       initmonitor();

        initresources();
        initdc();
        initresources();
        initdc();

-       initconfig();
+       initiconsize();

        initatoms();
 
        /* set window class */
        initatoms();
 
        /* set window class */


@@ -187,12 +193,13 @@ main(int argc, char *argv[])
        return 0;
 }
 
        return 0;
 }
 

-/* parse position string from -p, put results on config.x and config.y */
+/* parse position string from -p,
+ * put results on config.posx, config.posy, and config.monitor */

 static void
 static void

-parseposition(const char *optarg)
+parseposition(char *optarg)

 {
        long n;
 {
        long n;

-       const char *s = optarg;
+       char *s = optarg;

        char *endp;
 
        n = strtol(s, &endp, 10);
        char *endp;
 
        n = strtol(s, &endp, 10);


@@ -201,9 +208,24 @@ parseposition(const char *optarg)
        config.posx = n;
        s = endp+1;
        n = strtol(s, &endp, 10);
        config.posx = n;
        s = endp+1;
        n = strtol(s, &endp, 10);

-       if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0')
+       if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s)

                goto error;
        config.posy = n;
                goto error;
        config.posy = n;

+       if (*endp == ':') {
+               s = endp+1;
+               mflag = 1;
+               if (strncasecmp(s, "CUR", 3) == 0) {
+                       config.monitor = -1;
+                       endp = s+3;
+               } else {
+                       n = strtol(s, &endp, 10);
+                       if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0')
+                               goto error;
+                       config.monitor = n;
+               }
+       } else if (*endp != '\0') {
+               goto error;
+       }

 
        return;
 
 
        return;
 


@@ -234,14 +256,18 @@ parsefonts(const char *s)
                i = 0;
                while (isspace(*p))
                        p++;
                i = 0;
                while (isspace(*p))
                        p++;

-               while (*p != '\0' && *p != ',') {
+               while (i < sizeof buf && *p != '\0' && *p != ',')

                        buf[i++] = *p++;
                        buf[i++] = *p++;

-               }
+               if (i >= sizeof buf)
+                       errx(1, "font name too long");

                if (*p == ',')
                        p++;
                buf[i] = '\0';
                if (*p == ',')
                        p++;
                buf[i] = '\0';

+               if (nfont == 0)
+                       if ((dc.pattern = FcNameParse((FcChar8 *)buf)) == NULL)
+                               errx(1, "the first font in the cache must be loaded from a font string");

                if ((dc.fonts[nfont++] = XftFontOpenName(dpy, screen, buf)) == NULL)
                if ((dc.fonts[nfont++] = XftFontOpenName(dpy, screen, buf)) == NULL)

-                       errx(1, "cannot load font");
+                       errx(1, "could not load font");

        }
 }
 
        }
 }
 


@@ -250,16 +276,66 @@ static void
 ealloccolor(const char *s, XftColor *color)
 {
        if(!XftColorAllocName(dpy, visual, colormap, s, color))
 ealloccolor(const char *s, XftColor *color)
 {
        if(!XftColorAllocName(dpy, visual, colormap, s, color))

-               errx(1, "cannot allocate color: %s", s);
+               errx(1, "could not allocate color: %s", s);
+}
+
+/* query monitor information and cursor position */
+static void
+initmonitor(void)
+{
+       XineramaScreenInfo *info = NULL;
+       Window dw;          /* dummy variable */
+       int di;             /* dummy variable */
+       unsigned du;        /* dummy variable */
+       int cursx, cursy;   /* cursor position */
+       int nmons;
+       int i;
+
+       XQueryPointer(dpy, rootwin, &dw, &dw, &cursx, &cursy, &di, &di, &du);
+
+       mon.x = mon.y = 0;
+       mon.w = DisplayWidth(dpy, screen);
+       mon.h = DisplayHeight(dpy, screen);
+
+       if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) {
+               int selmon = 0;
+
+               if (!mflag || config.monitor < 0 || config.monitor >= nmons) {
+                       for (i = 0; i < nmons; i++) {
+                               if (BETWEEN(cursx, info[i].x_org, info[i].x_org + info[i].width) &&
+                                   BETWEEN(cursy, info[i].y_org, info[i].y_org + info[i].height)) {
+                                       selmon = i;
+                                       break;
+                               }
+                       }
+               } else {
+                       selmon = config.monitor;
+               }
+
+               mon.x = info[selmon].x_org;
+               mon.y = info[selmon].y_org;
+               mon.w = info[selmon].width;
+               mon.h = info[selmon].height;
+
+               XFree(info);
+       }
+
+       if (!pflag) {
+               config.posx = cursx;
+               config.posy = cursy;
+       } else if (mflag) {
+               config.posx += mon.x;
+               config.posy += mon.y;
+       }

 }
 
 /* read xrdb for configuration options */
 static void
 initresources(void)
 {
 }
 
 /* read xrdb for configuration options */
 static void
 initresources(void)
 {

-       char *xrm;

        long n;
        char *type;
        long n;
        char *type;

+       char *xrm;

        XrmDatabase xdb;
        XrmValue xval;
 
        XrmDatabase xdb;
        XrmValue xval;
 


@@ -321,18 +397,10 @@ initdc(void)
        dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
 }
 
        dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
 }
 

-/* calculate configuration values that are not set manually */
+/* calculate icon size */

 static void
 static void

-initconfig(void)
+initiconsize(void)

 {
 {

-       Window dw;   /* dummy variable */
-       int di;      /* dummy variable */
-       unsigned du; /* dummy variable */
-
-       if (!pflag)  /* if the user haven't specified a position, use cursor position*/
-               XQueryPointer(dpy, rootwin, &dw, &dw, &config.posx, &config.posy, &di, &di, &du);
-       config.screenw = DisplayWidth(dpy, screen);
-       config.screenh = DisplayHeight(dpy, screen);

        config.iconsize = config.height_pixels - config.iconpadding * 2;
 }
 
        config.iconsize = config.height_pixels - config.iconpadding * 2;
 }
 


@@ -376,10 +444,6 @@ allocitem(const char *label, const char *output, char *file)
        }
        item->y = 0;
        item->h = 0;
        }
        item->y = 0;
        item->h = 0;

-       if (item->label == NULL)
-               item->labellen = 0;
-       else
-               item->labellen = strlen(item->label);

        item->next = NULL;
        item->submenu = NULL;
        item->icon = NULL;
        item->next = NULL;
        item->submenu = NULL;
        item->icon = NULL;


@@ -400,12 +464,13 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
        menu->list = list;
        menu->caller = NULL;
        menu->selected = NULL;
        menu->list = list;
        menu->caller = NULL;
        menu->selected = NULL;

-       menu->w = 0;    /* calculated by setupmenu() */
-       menu->h = 0;    /* calculated by setupmenu() */
-       menu->x = 0;    /* calculated by setupmenu() */
-       menu->y = 0;    /* calculated by setupmenu() */
+       menu->w = 0;        /* recalculated by setupmenu() */
+       menu->h = 0;        /* recalculated by setupmenu() */
+       menu->x = mon.x;    /* recalculated by setupmenu() */
+       menu->y = mon.y;    /* recalculated by setupmenu() */

        menu->level = level;
        menu->drawn = 0;
        menu->level = level;
        menu->drawn = 0;

+       menu->hasicon = 0;

 
        swa.override_redirect = (wflag) ? False : True;
        swa.background_pixel = dc.normal[ColorBG].pixel;
 
        swa.override_redirect = (wflag) ? False : True;
        swa.background_pixel = dc.normal[ColorBG].pixel;


@@ -451,7 +516,7 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file)
                          menu = menu->parent, i++)
                        ;
                if (menu == NULL)
                          menu = menu->parent, i++)
                        ;
                if (menu == NULL)

-                       errx(1, "reached NULL menu");
+                       errx(1, "improper indentation detected");

 
                /* find last item in the new menu */
                for (item = menu->list; item->next != NULL; item = item->next)
 
                /* find last item in the new menu */
                for (item = menu->list; item->next != NULL; item = item->next)


@@ -480,6 +545,9 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file)
                curritem->prev = NULL;
        }
 
                curritem->prev = NULL;
        }
 

+       if (curritem->file)
+               prevmenu->hasicon = 1;
+

        return rootmenu;
 }
 
        return rootmenu;
 }
 


@@ -557,7 +625,7 @@ getnextutf8char(const char *s, const char **next_ret)
        s++;
        for (i = 1; i < usize; i++) {
                *next_ret = s+1;
        s++;
        for (i = 1; i < usize; i++) {
                *next_ret = s+1;

-               /* if byte is EOS or is not a continuation byte, return unknown */
+               /* if byte is nul or is not a continuation byte, return unknown */

                if (*s == '\0' || ((unsigned char)*s & utfmask[0]) != utfbyte[0])
                        return unknown;
                /* 6 is the number of relevant bits in the continuation byte */
                if (*s == '\0' || ((unsigned char)*s & utfmask[0]) != utfbyte[0])
                        return unknown;
                /* 6 is the number of relevant bits in the continuation byte */


@@ -573,51 +641,87 @@ getnextutf8char(const char *s, const char **next_ret)
        return ucode;
 }
 
        return ucode;
 }
 

-/* draw text into XftDraw */
+/* get which font contains a given code point */
+static XftFont *
+getfontucode(FcChar32 ucode)
+{
+       FcCharSet *fccharset = NULL;
+       FcPattern *fcpattern = NULL;
+       FcPattern *match = NULL;
+       XftFont *retfont = NULL;
+       XftResult result;
+       size_t i;
+
+       for (i = 0; i < dc.nfonts; i++)
+               if (XftCharExists(dpy, dc.fonts[i], ucode) == FcTrue)
+                       return dc.fonts[i];
+
+       /* create a charset containing our code point */
+       fccharset = FcCharSetCreate();
+       FcCharSetAddChar(fccharset, ucode);
+
+       /* create a pattern akin to the dc.pattern but containing our charset */
+       if (fccharset) {
+               fcpattern = FcPatternDuplicate(dc.pattern);
+               FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
+       }
+
+       /* find pattern matching fcpattern */
+       if (fcpattern) {
+               FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
+               FcDefaultSubstitute(fcpattern);
+               match = XftFontMatch(dpy, screen, fcpattern, &result);
+       }
+
+       /* if found a pattern, open its font */
+       if (match) {
+               retfont = XftFontOpenPattern(dpy, match);
+               if (retfont && XftCharExists(dpy, retfont, ucode) == FcTrue) {
+                       if ((dc.fonts = realloc(dc.fonts, dc.nfonts+1)) == NULL)
+                               err(1, "realloc");
+                       dc.fonts[dc.nfonts] = retfont;
+                       return dc.fonts[dc.nfonts++];
+               } else {
+                       XftFontClose(dpy, retfont);
+               }
+       }
+
+       /* in case no fount was found, return the first one */
+       return dc.fonts[0];
+}
+
+/* draw text into XftDraw, return width of text glyphs */

 static int
 drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text)
 {
 static int
 drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text)
 {

-       const char *s, *nexts;
-       FcChar32 ucode;
-       XftFont *currfont;
-       int textlen = 0;
+       int textwidth = 0;

 
 

-       s = text;
-       while (*s) {
+       while (*text) {
+               XftFont *currfont;

                XGlyphInfo ext;
                XGlyphInfo ext;

-               int charexists;
+               FcChar32 ucode;
+               const char *next;

                size_t len;
                size_t len;

-               size_t i;

 
 

-               charexists = 0;
-               ucode = getnextutf8char(s, &nexts);
-               for (i = 0; i < dc.nfonts; i++) {
-                       charexists = XftCharExists(dpy, dc.fonts[i], ucode);
-                       if (charexists)
-                               break;
-               }
-               if (charexists)
-                       currfont = dc.fonts[i];
-
-               len = nexts - s;
+               ucode = getnextutf8char(text, &next);
+               currfont = getfontucode(ucode);

 
 

-               XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)s,
-                                  len, &ext);
-               textlen += ext.xOff;
+               len = next - text;
+               XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)text, len, &ext);
+               textwidth += ext.xOff;

 
                if (draw) {
                        int texty;
 
 
                if (draw) {
                        int texty;
 

-                       texty = y + (h + currfont->ascent) / 2;
-                       XftDrawStringUtf8(draw, color, currfont, x, texty,
-                                         (XftChar8 *)s, len);
+                       texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent;
+                       XftDrawStringUtf8(draw, color, currfont, x, texty, (XftChar8 *)text, len);

                        x += ext.xOff;
                }
 
                        x += ext.xOff;
                }
 

-               s = nexts;
+               text = next;

        }
 
        }
 

-       return textlen;
+       return textwidth;

 }
 
 /* setup the height, width and icon of the items of a menu */
 }
 
 /* setup the height, width and icon of the items of a menu */


@@ -640,7 +744,7 @@ setupitems(struct Menu *menu)
                menu->h += item->h;
 
                if (item->label)
                menu->h += item->h;
 
                if (item->label)

-                       textwidth = drawtext(NULL, NULL, 0, 0, item->h, item->label);
+                       textwidth = drawtext(NULL, NULL, 0, 0, 0, item->label);

                else
                        textwidth = 0;
 
                else
                        textwidth = 0;
 


@@ -657,7 +761,7 @@ setupitems(struct Menu *menu)
                 * padding appears 3 times: before the label and around the triangle.
                 */
                itemwidth = textwidth + config.triangle_width + config.horzpadding * 3;
                 * padding appears 3 times: before the label and around the triangle.
                 */
                itemwidth = textwidth + config.triangle_width + config.horzpadding * 3;

-               itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding;
+               itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding;

                menu->w = MAX(menu->w, itemwidth);
        }
 }
                menu->w = MAX(menu->w, itemwidth);
        }
 }


@@ -671,27 +775,29 @@ setupmenupos(struct Menu *menu)
        width = menu->w + config.border_pixels * 2;
        height = menu->h + config.border_pixels * 2;
        if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */
        width = menu->w + config.border_pixels * 2;
        height = menu->h + config.border_pixels * 2;
        if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */

-               if (pflag || config.screenw - config.posx >= menu->w)
+               if (pflag || (config.posx > mon.x && mon.x + mon.w - config.posx >= width))

                        menu->x = config.posx;
                else if (config.posx > width)
                        menu->x = config.posx - width;
 
                        menu->x = config.posx;
                else if (config.posx > width)
                        menu->x = config.posx - width;
 

-               if (pflag || config.screenh - config.posy >= height)
+               if (pflag || (config.posy > mon.y && mon.y + mon.h - config.posy >= height))

                        menu->y = config.posy;
                        menu->y = config.posy;

-               else if (config.screenh > height)
-                       menu->y = config.screenh - height;
+               else if (mon.y + mon.h > height)
+                       menu->y = mon.y + mon.h - height;

        } else {                    /* else, calculate in respect to parent menu */
        } else {                    /* else, calculate in respect to parent menu */

-               if (config.screenw - (menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels) >= width)
-                       menu->x = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels;
+               int parentwidth;
+
+               parentwidth = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels;
+
+               if (mon.x + mon.w - parentwidth >= width)
+                       menu->x = parentwidth;

                else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels)
                        menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels;
 
                else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels)
                        menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels;
 

-               if (config.screenh - (menu->caller->y + menu->parent->y) > height)
+               if (mon.y + mon.h - (menu->caller->y + menu->parent->y) >= height)

                        menu->y = menu->caller->y + menu->parent->y;
                        menu->y = menu->caller->y + menu->parent->y;

-               else if (config.screenh - menu->parent->y > height)
-                       menu->y = menu->parent->y;
-               else if (config.screenh > height)
-                       menu->y = config.screenh - height;
+               else if (mon.y + mon.h > height)
+                       menu->y = mon.y + mon.h - height;

        }
 }
 
        }
 }
 


@@ -726,7 +832,7 @@ setupmenu(struct Menu *menu, XClassHint *classh)
        XStringListToTextProperty(&title, 1, &wintitle);
 
        /* set window manager hints */
        XStringListToTextProperty(&title, 1, &wintitle);
 
        /* set window manager hints */

-       sizeh.flags = PMaxSize | PMinSize;
+       sizeh.flags = USPosition | PMaxSize | PMinSize;

        sizeh.min_width = sizeh.max_width = menu->w;
        sizeh.min_height = sizeh.max_height = menu->h;
        XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);
        sizeh.min_width = sizeh.max_width = menu->w;
        sizeh.min_height = sizeh.max_height = menu->h;
        XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);


@@ -760,7 +866,7 @@ grabpointer(void)
                        return;
                nanosleep(&ts, NULL);
        }
                        return;
                nanosleep(&ts, NULL);
        }

-       errx(1, "cannot grab keyboard");
+       errx(1, "could not grab pointer");

 }
 
 /* try to grab keyboard, we may have to wait for another process to ungrab */
 }
 
 /* try to grab keyboard, we may have to wait for another process to ungrab */


@@ -776,7 +882,7 @@ grabkeyboard(void)
                        return;
                nanosleep(&ts, NULL);
        }
                        return;
                nanosleep(&ts, NULL);
        }

-       errx(1, "cannot grab keyboard");
+       errx(1, "could not grab keyboard");

 }
 
 /* load and scale icon */
 }
 
 /* load and scale icon */


@@ -784,13 +890,55 @@ static Imlib_Image
 loadicon(const char *file)
 {
        Imlib_Image icon;
 loadicon(const char *file)
 {
        Imlib_Image icon;

+       Imlib_Load_Error errcode;
+       const char *errstr;

        int width;
        int height;
        int imgsize;
 
        int width;
        int height;
        int imgsize;
 

-       icon = imlib_load_image(file);
-       if (icon == NULL)
-               errx(1, "cannot load icon %s", file);
+       icon = imlib_load_image_with_error_return(file, &errcode);
+       if (*file == '\0') {
+               warnx("could not load icon (file name is blank)");
+               return NULL;
+       } else if (icon == NULL) {
+               switch (errcode) {
+               case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST:
+                       errstr = "file does not exist";
+                       break;
+               case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY:
+                       errstr = "file is directory";
+                       break;
+               case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ:
+               case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE:
+                       errstr = "permission denied";
+                       break;
+               case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT:
+                       errstr = "unknown file format";
+                       break;
+               case IMLIB_LOAD_ERROR_PATH_TOO_LONG:
+                       errstr = "path too long";
+                       break;
+               case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT:
+               case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY:
+               case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE:
+                       errstr = "improper path";
+                       break;
+               case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS:
+                       errstr = "too many symbolic links";
+                       break;
+               case IMLIB_LOAD_ERROR_OUT_OF_MEMORY:
+                       errstr = "out of memory";
+                       break;
+               case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS:
+                       errstr = "out of file descriptors";
+                       break;
+               default:
+                       errstr = "unknown error";
+                       break;
+               }
+               warnx("could not load icon (%s): %s", errstr, file);
+               return NULL;
+       }

 
        imlib_context_set_image(icon);
 
 
        imlib_context_set_image(icon);
 


@@ -837,7 +985,7 @@ drawitems(struct Menu *menu)
 
                        /* draw text */
                        x = config.horzpadding;
 
                        /* draw text */
                        x = config.horzpadding;

-                       x += (iflag) ? 0 : config.horzpadding + config.iconsize;
+                       x += (iflag || !menu->hasicon) ? 0 : config.horzpadding + config.iconsize;

                        dsel = XftDrawCreate(dpy, item->sel, visual, colormap);
                        dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap);
                        XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel);
                        dsel = XftDrawCreate(dpy, item->sel, visual, colormap);
                        dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap);
                        XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel);


@@ -868,11 +1016,12 @@ drawitems(struct Menu *menu)
                        }
 
                        /* draw icon */
                        }
 
                        /* draw icon */

-                       if (item->file != NULL && !iflag) {
+                       if (item->file && !iflag)

                                item->icon = loadicon(item->file);
 
                                item->icon = loadicon(item->file);
 

-                               imlib_context_set_drawable(item->sel);
+                       if (item->icon) {

                                imlib_context_set_image(item->icon);
                                imlib_context_set_image(item->icon);

+                               imlib_context_set_drawable(item->sel);

                                imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
                                imlib_context_set_drawable(item->unsel);
                                imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
                                imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
                                imlib_context_set_drawable(item->unsel);
                                imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);


@@ -1186,6 +1335,8 @@ cleanmenu(struct Menu *menu)
 static void
 cleanup(void)
 {
 static void
 cleanup(void)
 {

+       size_t i;
+

        XUngrabPointer(dpy, CurrentTime);
        XUngrabKeyboard(dpy, CurrentTime);
 
        XUngrabPointer(dpy, CurrentTime);
        XUngrabKeyboard(dpy, CurrentTime);
 


@@ -1196,6 +1347,9 @@ cleanup(void)
        XftColorFree(dpy, visual, colormap, &dc.separator);
        XftColorFree(dpy, visual, colormap, &dc.border);
 
        XftColorFree(dpy, visual, colormap, &dc.separator);
        XftColorFree(dpy, visual, colormap, &dc.border);
 

+       for (i = 0; i < dc.nfonts; i++)
+               XftFontClose(dpy, dc.fonts[i]);
+

        XFreeGC(dpy, dc.gc);
        XCloseDisplay(dpy);
 }
        XFreeGC(dpy, dc.gc);
        XCloseDisplay(dpy);
 }