Update and rename README to README.md

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index af0f801..a80876d 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -1,7 +1,10 @@
+#include <ctype.h>

 #include <err.h>
 #include <err.h>

+#include <errno.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <limits.h>

 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <time.h>
 #include <unistd.h>
 #include <X11/Xlib.h>


@@ -17,7 +20,11 @@
  * Function declarations
  */
 
  * Function declarations
  */
 

+/* argument parser */
+static void parseposition(const char *optarg);
+

 /* initializers, and their helper routines */
 /* initializers, and their helper routines */

+static void parsefonts(const char *s);

 static void ealloccolor(const char *s, XftColor *color);
 static void initresources(void);
 static void initdc(void);
 static void ealloccolor(const char *s, XftColor *color);
 static void initresources(void);
 static void initdc(void);


@@ -30,8 +37,9 @@ static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned l
 static struct Menu *buildmenutree(unsigned level, const char *label, const char *output, char *file);
 static struct Menu *parsestdin(void);
 
 static struct Menu *buildmenutree(unsigned level, const char *label, const char *output, char *file);
 static struct Menu *parsestdin(void);
 

-/* image loader */
-static Imlib_Image loadicon(const char *file);
+/* text drawer, and its helper routine */
+static FcChar32 getnextutf8char(const char *s, const char **end_ret);
+static int drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text);

 
 /* structure setters, and their helper routines */
 static void setupitems(struct Menu *menu);
 
 /* structure setters, and their helper routines */
 static void setupitems(struct Menu *menu);


@@ -42,16 +50,22 @@ static void setupmenu(struct Menu *menu, XClassHint *classh);
 static void grabpointer(void);
 static void grabkeyboard(void);
 
 static void grabpointer(void);
 static void grabkeyboard(void);
 

-/* window drawers and mappers */
+/* item drawer, and its helper routine */
+static Imlib_Image loadicon(const char *file);
+static void drawitems(struct Menu *menu);
+
+/* menu drawers and mappers */
+static void drawmenus(struct Menu *currmenu);

 static void mapmenu(struct Menu *currmenu);
 static void mapmenu(struct Menu *currmenu);

-static void drawseparator(struct Menu *menu, struct Item *item);
-static void drawitem(struct Menu *menu, struct Item *item, XftColor *color);
-static void drawmenu(struct Menu *currmenu);

 
 

-/* main event loop, and its helper routines */
+/* getters */

 static struct Menu *getmenu(struct Menu *currmenu, Window win);
 static struct Item *getitem(struct Menu *menu, int y);
 static struct Menu *getmenu(struct Menu *currmenu, Window win);
 static struct Item *getitem(struct Menu *menu, int y);

+
+/* cycle through items */

 static struct Item *itemcycle(struct Menu *currmenu, int direction);
 static struct Item *itemcycle(struct Menu *currmenu, int direction);

+
+/* main event loop */

 static void run(struct Menu *currmenu);
 
 /* cleaners */
 static void run(struct Menu *currmenu);
 
 /* cleaners */


@@ -78,8 +92,9 @@ static Atom wmdelete;
 static Atom netatom[NetLast];
 
 /* flags */
 static Atom netatom[NetLast];
 
 /* flags */

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

 static int iflag = 0;   /* whether to disable icons */
 static int iflag = 0;   /* whether to disable icons */

+static int pflag = 0;   /* whether the user specified a position */
+static int wflag = 0;   /* whether to let the window manager control XMenu */

 
 /* include config variable */
 #include "config.h"
 
 /* include config variable */
 #include "config.h"


@@ -97,11 +112,15 @@ main(int argc, char *argv[])
        XClassHint classh;
        int ch;
 
        XClassHint classh;
        int ch;
 

-       while ((ch = getopt(argc, argv, "iw")) != -1) {
+       while ((ch = getopt(argc, argv, "ip:w")) != -1) {

                switch (ch) {
                case 'i':
                        iflag = 1;
                        break;
                switch (ch) {
                case 'i':
                        iflag = 1;
                        break;

+               case 'p':
+                       pflag = 1;
+                       parseposition(optarg);
+                       break;

                case 'w':
                        wflag = 1;
                        break;
                case 'w':
                        wflag = 1;
                        break;


@@ -168,6 +187,64 @@ main(int argc, char *argv[])
        return 0;
 }
 
        return 0;
 }
 

+/* parse position string from -p, put results on config.x and config.y */
+static void
+parseposition(const char *optarg)
+{
+       long n;
+       const char *s = optarg;
+       char *endp;
+
+       n = strtol(s, &endp, 10);
+       if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != 'x')
+               goto error;
+       config.posx = n;
+       s = endp+1;
+       n = strtol(s, &endp, 10);
+       if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0')
+               goto error;
+       config.posy = n;
+
+       return;
+
+error:
+       errx(1, "improper position: %s", optarg);
+}
+
+/* parse color string */
+static void
+parsefonts(const char *s)
+{
+       const char *p;
+       char buf[1024];
+       size_t nfont = 0;
+
+       dc.nfonts = 1;
+       for (p = s; *p; p++)
+               if (*p == ',')
+                       dc.nfonts++;
+
+       if ((dc.fonts = calloc(dc.nfonts, sizeof *dc.fonts)) == NULL)
+               err(1, "calloc");
+
+       p = s;
+       while (*p != '\0') {
+               size_t i;
+
+               i = 0;
+               while (isspace(*p))
+                       p++;
+               while (*p != '\0' && *p != ',') {
+                       buf[i++] = *p++;
+               }
+               if (*p == ',')
+                       p++;
+               buf[i] = '\0';
+               if ((dc.fonts[nfont++] = XftFontOpenName(dpy, screen, buf)) == NULL)
+                       errx(1, "cannot load font");
+       }
+}
+

 /* get color from color string */
 static void
 ealloccolor(const char *s, XftColor *color)
 /* get color from color string */
 static void
 ealloccolor(const char *s, XftColor *color)


@@ -237,9 +314,8 @@ initdc(void)
        ealloccolor(config.separator_color,     &dc.separator);
        ealloccolor(config.border_color,        &dc.border);
 
        ealloccolor(config.separator_color,     &dc.separator);
        ealloccolor(config.border_color,        &dc.border);
 

-       /* try to get font */
-       if ((dc.font = XftFontOpenName(dpy, screen, config.font)) == NULL)
-               errx(1, "cannot load font");
+       /* parse fonts */
+       parsefonts(config.font);

 
        /* create common GC */
        dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
 
        /* create common GC */
        dc.gc = XCreateGC(dpy, rootwin, 0, NULL);


@@ -253,7 +329,8 @@ initconfig(void)
        int di;      /* dummy variable */
        unsigned du; /* dummy variable */
 
        int di;      /* dummy variable */
        unsigned du; /* dummy variable */
 

-       XQueryPointer(dpy, rootwin, &dw, &dw, &config.cursx, &config.cursy, &di, &di, &du);
+       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.screenw = DisplayWidth(dpy, screen);
        config.screenh = DisplayHeight(dpy, screen);
        config.iconsize = config.height_pixels - config.iconpadding * 2;


@@ -328,6 +405,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
        menu->x = 0;    /* calculated by setupmenu() */
        menu->y = 0;    /* calculated by setupmenu() */
        menu->level = level;
        menu->x = 0;    /* calculated by setupmenu() */
        menu->y = 0;    /* calculated by setupmenu() */
        menu->level = level;

+       menu->drawn = 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;


@@ -446,42 +524,113 @@ parsestdin(void)
        return rootmenu;
 }
 
        return rootmenu;
 }
 

-/* load and scale icon */
-static Imlib_Image
-loadicon(const char *file)
+/* get next utf8 char from s return its codepoint and set next_ret to pointer to end of character */
+static FcChar32
+getnextutf8char(const char *s, const char **next_ret)

 {
 {

-       Imlib_Image icon;
-       int width;
-       int height;
-       int imgsize;
+       static const unsigned char utfbyte[] = {0x80, 0x00, 0xC0, 0xE0, 0xF0};
+       static const unsigned char utfmask[] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
+       static const FcChar32 utfmin[] = {0, 0x00,  0x80,  0x800,  0x10000};
+       static const FcChar32 utfmax[] = {0, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
+       /* 0xFFFD is the replacement character, used to represent unknown characters */
+       static const FcChar32 unknown = 0xFFFD;
+       FcChar32 ucode;         /* FcChar32 type holds 32 bits */
+       size_t usize = 0;       /* n' of bytes of the utf8 character */
+       size_t i;
+
+       *next_ret = s+1;
+
+       /* get code of first byte of utf8 character */
+       for (i = 0; i < sizeof utfmask; i++) {
+               if (((unsigned char)*s & utfmask[i]) == utfbyte[i]) {
+                       usize = i;
+                       ucode = (unsigned char)*s & ~utfmask[i];
+                       break;
+               }
+       }

 
 

-       icon = imlib_load_image(file);
-       if (icon == NULL)
-               errx(1, "cannot load icon %s", file);
+       /* if first byte is a continuation byte or is not allowed, return unknown */
+       if (i == sizeof utfmask || usize == 0)
+               return unknown;
+
+       /* check the other usize-1 bytes */
+       s++;
+       for (i = 1; i < usize; i++) {
+               *next_ret = s+1;
+               /* if byte is EOS 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 */
+               ucode = (ucode << 6) | ((unsigned char)*s & ~utfmask[0]);
+               s++;
+       }

 
 

-       imlib_context_set_image(icon);
+       /* check if ucode is invalid or in utf-16 surrogate halves */
+       if (!BETWEEN(ucode, utfmin[usize], utfmax[usize])
+           || BETWEEN (ucode, 0xD800, 0xDFFF))
+               return unknown;

 
 

-       width = imlib_image_get_width();
-       height = imlib_image_get_height();
-       imgsize = MIN(width, height);
+       return ucode;
+}

 
 

-       icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize,
-                                                config.iconsize,
-                                                config.iconsize);
+/* draw text into XftDraw */
+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;
+
+       s = text;
+       while (*s) {
+               XGlyphInfo ext;
+               int charexists;
+               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];

 
 

-       return icon;
+               len = nexts - s;
+
+               XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)s,
+                                  len, &ext);
+               textlen += ext.xOff;
+
+               if (draw) {
+                       int texty;
+
+                       texty = y + (h + currfont->ascent) / 2;
+                       XftDrawStringUtf8(draw, color, currfont, x, texty,
+                                         (XftChar8 *)s, len);
+                       x += ext.xOff;
+               }
+
+               s = nexts;
+       }
+
+       return textlen;

 }
 
 /* setup the height, width and icon of the items of a menu */
 static void
 setupitems(struct Menu *menu)
 {
 }
 
 /* setup the height, width and icon of the items of a menu */
 static void
 setupitems(struct Menu *menu)
 {

-       XGlyphInfo ext;

        struct Item *item;
        struct Item *item;

-       int itemwidth;

 
        menu->w = config.width_pixels;
        for (item = menu->list; item != NULL; item = item->next) {
 
        menu->w = config.width_pixels;
        for (item = menu->list; item != NULL; item = item->next) {

+               int itemwidth;
+               int textwidth;
+

                item->y = menu->h;
 
                if (item->label == NULL)   /* height for separator item */
                item->y = menu->h;
 
                if (item->label == NULL)   /* height for separator item */


@@ -490,29 +639,26 @@ setupitems(struct Menu *menu)
                        item->h = config.height_pixels;
                menu->h += item->h;
 
                        item->h = config.height_pixels;
                menu->h += item->h;
 

-               /* get length of item->label rendered in the font */
-               XftTextExtentsUtf8(dpy, dc.font, (XftChar8 *)item->label,
-                                  item->labellen, &ext);
+               if (item->label)
+                       textwidth = drawtext(NULL, NULL, 0, 0, item->h, item->label);
+               else
+                       textwidth = 0;

 
                /*
                 * set menu width
                 *
 
                /*
                 * set menu width
                 *

-                * the item width depends on the size of its label (ext.xOff),
+                * the item width depends on the size of its label (textwidth),

                 * and it is only used to calculate the width of the menu (which
                 * is equal to the width of the largest item).
                 *
                 * the horizontal padding appears 4 times through the width of a
                 * and it is only used to calculate the width of the menu (which
                 * is equal to the width of the largest item).
                 *
                 * the horizontal padding appears 4 times through the width of a

-                * item: before and after its icon, and before and after its triangle
+                * item: before and after its icon, and before and after its triangle.

                 * if the iflag is set (icons are disabled) then the horizontal
                 * if the iflag is set (icons are disabled) then the horizontal

-                * padding appears before the label and around the triangle.
+                * padding appears 3 times: before the label and around the triangle.

                 */
                 */

-               itemwidth = ext.xOff + config.triangle_width + config.horzpadding * 3;
+               itemwidth = textwidth + config.triangle_width + config.horzpadding * 3;

                itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding;
                menu->w = MAX(menu->w, itemwidth);
                itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding;
                menu->w = MAX(menu->w, itemwidth);

-
-               /* create icon */
-               if (item->file != NULL && !iflag)
-                       item->icon = loadicon(item->file);

        }
 }
 
        }
 }
 


@@ -525,13 +671,13 @@ 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 (config.screenw - config.cursx >= menu->w)
-                       menu->x = config.cursx;
-               else if (config.cursx > width)
-                       menu->x = config.cursx - width;
+               if (pflag || config.screenw - config.posx >= menu->w)
+                       menu->x = config.posx;
+               else if (config.posx > width)
+                       menu->x = config.posx - width;

 
 

-               if (config.screenh - config.cursy >= height)
-                       menu->y = config.cursy;
+               if (pflag || config.screenh - config.posy >= height)
+                       menu->y = config.posy;

                else if (config.screenh > height)
                        menu->y = config.screenh - height;
        } else {                    /* else, calculate in respect to parent menu */
                else if (config.screenh > height)
                        menu->y = config.screenh - height;
        } else {                    /* else, calculate in respect to parent menu */


@@ -585,11 +731,6 @@ setupmenu(struct Menu *menu, XClassHint *classh)
        sizeh.min_height = sizeh.max_height = menu->h;
        XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);
 
        sizeh.min_height = sizeh.max_height = menu->h;
        XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh);
 

-       /* create pixmap and XftDraw */
-       menu->pixmap = XCreatePixmap(dpy, menu->win, menu->w, menu->h,
-                                    DefaultDepth(dpy, screen));
-       menu->draw = XftDrawCreate(dpy, menu->pixmap, visual, colormap);
-

        /* set WM protocols and ewmh window properties */
        XSetWMProtocols(dpy, menu->win, &wmdelete, 1);
        XChangeProperty(dpy, menu->win, netatom[NetWMName], utf8string, 8,
        /* set WM protocols and ewmh window properties */
        XSetWMProtocols(dpy, menu->win, &wmdelete, 1);
        XChangeProperty(dpy, menu->win, netatom[NetWMName], utf8string, 8,


@@ -638,6 +779,131 @@ grabkeyboard(void)
        errx(1, "cannot grab keyboard");
 }
 
        errx(1, "cannot grab keyboard");
 }
 

+/* load and scale icon */
+static Imlib_Image
+loadicon(const char *file)
+{
+       Imlib_Image icon;
+       int width;
+       int height;
+       int imgsize;
+
+       icon = imlib_load_image(file);
+       if (icon == NULL)
+               errx(1, "cannot load icon %s", file);
+
+       imlib_context_set_image(icon);
+
+       width = imlib_image_get_width();
+       height = imlib_image_get_height();
+       imgsize = MIN(width, height);
+
+       icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize,
+                                                config.iconsize,
+                                                config.iconsize);
+
+       return icon;
+}
+
+/* draw pixmap for the selected and unselected version of each item on menu */
+static void
+drawitems(struct Menu *menu)
+{
+       struct Item *item;
+
+       for (item = menu->list; item != NULL; item = item->next) {
+               XftDraw *dsel, *dunsel;
+               int x, y;
+
+               item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h,
+                                         DefaultDepth(dpy, screen));
+
+               XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel);
+               XFillRectangle(dpy, item->unsel, dc.gc, 0, 0, menu->w, item->h);
+
+               if (item->label == NULL) { /* item is separator */
+                       y = item->h/2;
+                       XSetForeground(dpy, dc.gc, dc.separator.pixel);
+                       XDrawLine(dpy, item->unsel, dc.gc, config.horzpadding, y,
+                                 menu->w - config.horzpadding, y);
+
+                       item->sel = item->unsel;
+               } else {
+
+                       item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h,
+                                                 DefaultDepth(dpy, screen));
+                       XSetForeground(dpy, dc.gc, dc.selected[ColorBG].pixel);
+                       XFillRectangle(dpy, item->sel, dc.gc, 0, 0, menu->w, item->h);
+
+                       /* draw text */
+                       x = config.horzpadding;
+                       x += (iflag) ? 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);
+                       drawtext(dsel, &dc.selected[ColorFG], x, 0, item->h, item->label);
+                       XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel);
+                       drawtext(dunsel, &dc.normal[ColorFG], x, 0, item->h, item->label);
+                       XftDrawDestroy(dsel);
+                       XftDrawDestroy(dunsel);
+
+                       /* draw triangle */
+                       if (item->submenu != NULL) {
+                               x = menu->w - config.triangle_width - config.horzpadding;
+                               y = (item->h - config.triangle_height + 1) / 2;
+
+                               XPoint triangle[] = {
+                                       {x, y},
+                                       {x + config.triangle_width, y + config.triangle_height/2},
+                                       {x, y + config.triangle_height},
+                                       {x, y}
+                               };
+
+                               XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel);
+                               XFillPolygon(dpy, item->sel, dc.gc, triangle, LEN(triangle),
+                                            Convex, CoordModeOrigin);
+                               XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel);
+                               XFillPolygon(dpy, item->unsel, dc.gc, triangle, LEN(triangle),
+                                            Convex, CoordModeOrigin);
+                       }
+
+                       /* draw icon */
+                       if (item->file != NULL && !iflag) {
+                               item->icon = loadicon(item->file);
+
+                               imlib_context_set_drawable(item->sel);
+                               imlib_context_set_image(item->icon);
+                               imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
+                               imlib_context_set_drawable(item->unsel);
+                               imlib_render_image_on_drawable(config.horzpadding, config.iconpadding);
+                       }
+               }
+       }
+}
+
+/* copy pixmaps of items of the current menu and of its ancestors into menu window */
+static void
+drawmenus(struct Menu *currmenu)
+{
+       struct Menu *menu;
+       struct Item *item;
+
+       for (menu = currmenu; menu != NULL; menu = menu->parent) {
+               if (!menu->drawn) {
+                       drawitems(menu);
+                       menu->drawn = 1;
+               }
+               for (item = menu->list; item != NULL; item = item->next) {
+                       if (item == menu->selected)
+                               XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0,
+                                         menu->w, item->h, 0, item->y);
+                       else
+                               XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0,
+                                         menu->w, item->h, 0, item->y);
+               }
+       }
+}
+

 /* umap previous menus and map current menu and its parents */
 static void
 mapmenu(struct Menu *currmenu)
 /* umap previous menus and map current menu and its parents */
 static void
 mapmenu(struct Menu *currmenu)


@@ -697,91 +963,6 @@ mapmenu(struct Menu *currmenu)
        prevmenu = currmenu;
 }
 
        prevmenu = currmenu;
 }
 

-/* draw separator item */
-static void
-drawseparator(struct Menu *menu, struct Item *item)
-{
-       int y;
-
-       y = item->y + item->h/2;
-
-       XSetForeground(dpy, dc.gc, dc.separator.pixel);
-       XDrawLine(dpy, menu->pixmap, dc.gc, config.horzpadding, y,
-                 menu->w - config.horzpadding, y);
-}
-
-/* draw regular item */
-static void
-drawitem(struct Menu *menu, struct Item *item, XftColor *color)
-{
-       int x, y;
-
-       x = config.horzpadding;
-       x += (iflag) ? 0 : config.horzpadding + config.iconsize;
-       y = item->y + (item->h + dc.font->ascent) / 2;
-       XSetForeground(dpy, dc.gc, color[ColorFG].pixel);
-       XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font,
-                      x, y, (XftChar8 *)item->label, item->labellen);
-
-       /* draw triangle, if item contains a submenu */
-       if (item->submenu != NULL) {
-               x = menu->w - config.triangle_width - config.horzpadding;
-               y = item->y + (item->h - config.triangle_height + 1) / 2;
-
-               XPoint triangle[] = {
-                       {x, y},
-                       {x + config.triangle_width, y + config.triangle_height/2},
-                       {x, y + config.triangle_height},
-                       {x, y}
-               };
-
-               XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle),
-                            Convex, CoordModeOrigin);
-       }
-
-       /* draw icon */
-       if (item->icon != NULL) {
-               x = config.horzpadding;
-               y = item->y + config.iconpadding;
-               imlib_context_set_drawable(menu->pixmap);
-               imlib_context_set_image(item->icon);
-               imlib_render_image_on_drawable(x, y);
-       }
-}
-
-/* draw items of the current menu and of its ancestors */
-static void
-drawmenu(struct Menu *currmenu)
-{
-       struct Menu *menu;
-       struct Item *item;
-
-       for (menu = currmenu; menu != NULL; menu = menu->parent) {
-               for (item = menu->list; item != NULL; item = item->next) {
-                       XftColor *color;
-
-                       /* determine item color */
-                       if (item == menu->selected && item->label != NULL)
-                               color = dc.selected;
-                       else
-                               color = dc.normal;
-
-                       /* draw item box */
-                       XSetForeground(dpy, dc.gc, color[ColorBG].pixel);
-                       XFillRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
-                                      menu->w, item->h);
-
-                       if (item->label == NULL)  /* item is a separator */
-                               drawseparator(menu, item);
-                       else                      /* item is a regular item */
-                               drawitem(menu, item, color);
-               }
-
-               XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, 0,
-                             menu->w, menu->h, 0, 0);
-       }
-}
-

 /* get menu of given window */
 static struct Menu *
 getmenu(struct Menu *currmenu, Window win)
 /* get menu of given window */
 static struct Menu *
 getmenu(struct Menu *currmenu, Window win)


@@ -868,7 +1049,7 @@ run(struct Menu *currmenu)
                switch(ev.type) {
                case Expose:
                        if (ev.xexpose.count == 0)
                switch(ev.type) {
                case Expose:
                        if (ev.xexpose.count == 0)

-                               drawmenu(currmenu);
+                               drawmenus(currmenu);

                        break;
                case MotionNotify:
                        menu = getmenu(currmenu, ev.xbutton.window);
                        break;
                case MotionNotify:
                        menu = getmenu(currmenu, ev.xbutton.window);


@@ -884,7 +1065,7 @@ run(struct Menu *currmenu)
                                currmenu = menu;
                        }
                        mapmenu(currmenu);
                                currmenu = menu;
                        }
                        mapmenu(currmenu);

-                       drawmenu(currmenu);
+                       drawmenus(currmenu);

                        break;
                case ButtonRelease:
                        menu = getmenu(currmenu, ev.xbutton.window);
                        break;
                case ButtonRelease:
                        menu = getmenu(currmenu, ev.xbutton.window);


@@ -902,7 +1083,7 @@ selectitem:
                        }
                        mapmenu(currmenu);
                        currmenu->selected = currmenu->list;
                        }
                        mapmenu(currmenu);
                        currmenu->selected = currmenu->list;

-                       drawmenu(currmenu);
+                       drawmenus(currmenu);

                        break;
                case ButtonPress:
                        menu = getmenu(currmenu, ev.xbutton.window);
                        break;
                case ButtonPress:
                        menu = getmenu(currmenu, ev.xbutton.window);


@@ -938,12 +1119,12 @@ selectitem:
                        } else
                                break;
                        currmenu->selected = item;
                        } else
                                break;
                        currmenu->selected = item;

-                       drawmenu(currmenu);
+                       drawmenus(currmenu);

                        break;
                case LeaveNotify:
                        previtem = NULL;
                        currmenu->selected = NULL;
                        break;
                case LeaveNotify:
                        previtem = NULL;
                        currmenu->selected = NULL;

-                       drawmenu(currmenu);
+                       drawmenus(currmenu);

                        break;
                case ConfigureNotify:
                        menu = getmenu(currmenu, ev.xconfigure.window);
                        break;
                case ConfigureNotify:
                        menu = getmenu(currmenu, ev.xconfigure.window);


@@ -978,6 +1159,11 @@ cleanmenu(struct Menu *menu)
                if (item->submenu != NULL)
                        cleanmenu(item->submenu);
                tmp = item;
                if (item->submenu != NULL)
                        cleanmenu(item->submenu);
                tmp = item;

+               if (menu->drawn) {
+                       XFreePixmap(dpy, item->unsel);
+                       if (tmp->label != NULL)
+                               XFreePixmap(dpy, item->sel);
+               }

                if (tmp->label != tmp->output)
                        free(tmp->label);
                free(tmp->output);
                if (tmp->label != tmp->output)
                        free(tmp->label);
                free(tmp->output);


@@ -992,8 +1178,6 @@ cleanmenu(struct Menu *menu)
                free(tmp);
        }
 
                free(tmp);
        }
 

-       XFreePixmap(dpy, menu->pixmap);
-       XftDrawDestroy(menu->draw);

        XDestroyWindow(dpy, menu->win);
        free(menu);
 }
        XDestroyWindow(dpy, menu->win);
        free(menu);
 }


@@ -1020,6 +1204,6 @@ cleanup(void)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

-       (void)fprintf(stderr, "usage: xmenu [-iw] [title]\n");
+       (void)fprintf(stderr, "usage: xmenu [-iw] [-p position] [title]\n");

        exit(1);
 }
        exit(1);
 }