Merge pull request #2 from emanuele6/patch-1

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 116f31d..64dd46b 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -8,6 +8,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 <Imlib2.h>

 
 #define PROGNAME "xmenu"
 #define ITEMPREV 0
 
 #define PROGNAME "xmenu"
 #define ITEMPREV 0


@@ -28,7 +29,6 @@ struct DC {
        XftColor border;
        XftColor separator;
 
        XftColor border;
        XftColor separator;
 

-       Drawable d;

        GC gc;
        XftFont *font;
 };
        GC gc;
        XftFont *font;
 };


@@ -46,12 +46,14 @@ struct Geometry {
 struct Item {
        char *label;            /* string to be drawed on menu */
        char *output;           /* string to be outputed when item is clicked */
 struct Item {
        char *label;            /* string to be drawed on menu */
        char *output;           /* string to be outputed when item is clicked */

+       char *file;             /* filename of the icon */

        int y;                  /* item y position relative to menu */
        int h;                  /* item height */
        size_t labellen;        /* strlen(label) */
        struct Item *prev;      /* previous item */
        struct Item *next;      /* next item */
        struct Menu *submenu;   /* submenu spawned by clicking on item */
        int y;                  /* item y position relative to menu */
        int h;                  /* item height */
        size_t labellen;        /* strlen(label) */
        struct Item *prev;      /* previous item */
        struct Item *next;      /* next item */
        struct Menu *submenu;   /* submenu spawned by clicking on item */

+       Imlib_Image icon;

 };
 
 /* menu structure */
 };
 
 /* menu structure */


@@ -71,11 +73,15 @@ struct Menu {
 static void getresources(void);
 static void getcolor(const char *s, XftColor *color);
 static void setupdc(void);
 static void getresources(void);
 static void getcolor(const char *s, XftColor *color);
 static void setupdc(void);

-static void calcgeom(void);
-static struct Item *allocitem(const char *label, const char *output);
+static void calcgeom(struct Geometry *geom);
+static struct Item *allocitem(const char *label, const char *output, char *file);

 static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level);
 static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level);

+static struct Menu *buildmenutree(unsigned level, const char *label, const char *output, char *file);

 static struct Menu *parsestdin(void);
 static struct Menu *parsestdin(void);

-static void calcmenu(struct Menu *menu);
+static Imlib_Image loadicon(const char *file, int size);
+static void setupmenusize(struct Geometry *geom, struct Menu *menu);
+static void setupmenupos(struct Geometry *geom, struct Menu *menu);
+static void setupmenu(struct Geometry *geom, struct Menu *menu, XClassHint *classh);

 static void grabpointer(void);
 static void grabkeyboard(void);
 static struct Menu *getmenu(struct Menu *currmenu, Window win);
 static void grabpointer(void);
 static void grabkeyboard(void);
 static struct Menu *getmenu(struct Menu *currmenu, Window win);


@@ -86,29 +92,38 @@ static void drawitem(struct Menu *menu, struct Item *item, XftColor *color);
 static void drawmenu(struct Menu *currmenu);
 static struct Item *itemcycle(struct Menu *currmenu, int direction);
 static void run(struct Menu *currmenu);
 static void drawmenu(struct Menu *currmenu);
 static struct Item *itemcycle(struct Menu *currmenu, int direction);
 static void run(struct Menu *currmenu);

-static void freewindow(struct Menu *menu);
-static void cleanup(struct Menu *rootmenu);
+static void freemenu(struct Menu *menu);
+static void cleanup(void);

 static void usage(void);
 
 static void usage(void);
 

-/* global variables (X stuff and geometries) */
+/* X stuff */

 static Display *dpy;
 static int screen;
 static Visual *visual;
 static Window rootwin;
 static Colormap colormap;
 static struct DC dc;
 static Display *dpy;
 static int screen;
 static Visual *visual;
 static Window rootwin;
 static Colormap colormap;
 static struct DC dc;

-static struct Geometry geom;
+static Atom wmdelete;
+
+/* flags */
+static int wflag = 0;   /* whether to let the window manager control XMenu */

 
 #include "config.h"
 
 
 #include "config.h"
 

+/* xmenu: generate menu from stdin and print selected entry to stdout */

 int
 main(int argc, char *argv[])
 {
        struct Menu *rootmenu;
 int
 main(int argc, char *argv[])
 {
        struct Menu *rootmenu;

+       struct Geometry geom;
+       XClassHint classh;

        int ch;
 
        int ch;
 

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

                switch (ch) {
                switch (ch) {

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

                default:
                        usage();
                        break;
                default:
                        usage();
                        break;


@@ -117,7 +132,7 @@ main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 
        argc -= optind;
        argv += optind;
 

-       if (argc != 0)
+       if (argc > 1)

                usage();
 
        /* open connection to server and set X variables */
                usage();
 
        /* open connection to server and set X variables */


@@ -127,26 +142,46 @@ main(int argc, char *argv[])
        visual = DefaultVisual(dpy, screen);
        rootwin = RootWindow(dpy, screen);
        colormap = DefaultColormap(dpy, screen);
        visual = DefaultVisual(dpy, screen);
        rootwin = RootWindow(dpy, screen);
        colormap = DefaultColormap(dpy, screen);

+       wmdelete=XInternAtom(dpy, "WM_DELETE_WINDOW", True);
+
+       /* imlib2 stuff */
+       imlib_set_cache_size(2048 * 1024);
+       imlib_context_set_dither(1);
+       imlib_context_set_display(dpy);
+       imlib_context_set_visual(visual);
+       imlib_context_set_colormap(colormap);

 
        /* setup */
        getresources();
        setupdc();
 
        /* setup */
        getresources();
        setupdc();

-       calcgeom();
+       calcgeom(&geom);

 
 

-       /* generate menus and recalculate them */
+       /* set window class */
+       classh.res_class = PROGNAME;
+       if (argc == 1)
+               classh.res_name = *argv;
+       else
+               classh.res_name = PROGNAME;
+
+       /* generate menus and set them up */

        rootmenu = parsestdin();
        if (rootmenu == NULL)
                errx(1, "no menu generated");
        rootmenu = parsestdin();
        if (rootmenu == NULL)
                errx(1, "no menu generated");

-       calcmenu(rootmenu);
+       setupmenu(&geom, rootmenu, &classh);

 
        /* grab mouse and keyboard */
 
        /* grab mouse and keyboard */

-       grabpointer();
-       grabkeyboard();
+       if (!wflag) {
+               grabpointer();
+               grabkeyboard();
+       }

 
        /* run event loop */
        run(rootmenu);
 
 
        /* run event loop */
        run(rootmenu);
 

-       cleanup(rootmenu);
+       /* freeing stuff */
+       freemenu(rootmenu);
+       cleanup();
+

        return 0;
 }
 
        return 0;
 }
 


@@ -172,9 +207,9 @@ getresources(void)
        if (XrmGetResource(xdb, "xmenu.separatorWidth", "*", &type, &xval) == True)
                if ((n = strtol(xval.addr, NULL, 10)) > 0)
                        separator_pixels = n;
        if (XrmGetResource(xdb, "xmenu.separatorWidth", "*", &type, &xval) == True)
                if ((n = strtol(xval.addr, NULL, 10)) > 0)
                        separator_pixels = n;

-       if (XrmGetResource(xdb, "xmenu.padding", "*", &type, &xval) == True)
+       if (XrmGetResource(xdb, "xmenu.height", "*", &type, &xval) == True)

                if ((n = strtol(xval.addr, NULL, 10)) > 0)
                if ((n = strtol(xval.addr, NULL, 10)) > 0)

-                       padding_pixels = n;
+                       height_pixels = n;

        if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True)
                if ((n = strtol(xval.addr, NULL, 10)) > 0)
                        width_pixels = n;
        if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True)
                if ((n = strtol(xval.addr, NULL, 10)) > 0)
                        width_pixels = n;


@@ -226,46 +261,57 @@ setupdc(void)
 
 /* calculate menu and screen geometry */
 static void
 
 /* calculate menu and screen geometry */
 static void

-calcgeom(void)
+calcgeom(struct Geometry *geom)

 {
        Window w1, w2;  /* unused variables */
        int a, b;       /* unused variables */
        unsigned mask;  /* unused variable */
 
 {
        Window w1, w2;  /* unused variables */
        int a, b;       /* unused variables */
        unsigned mask;  /* unused variable */
 

-       XQueryPointer(dpy, rootwin, &w1, &w2, &geom.cursx, &geom.cursy, &a, &b, &mask);
-       geom.screenw = DisplayWidth(dpy, screen);
-       geom.screenh = DisplayHeight(dpy, screen);
-       geom.itemh = dc.font->height + padding_pixels * 2;
-       geom.itemw = width_pixels;
-       geom.border = border_pixels;
-       geom.separator = separator_pixels;
+       XQueryPointer(dpy, rootwin, &w1, &w2, &geom->cursx, &geom->cursy, &a, &b, &mask);
+       geom->screenw = DisplayWidth(dpy, screen);
+       geom->screenh = DisplayHeight(dpy, screen);
+       geom->itemh = height_pixels;
+       geom->itemw = width_pixels;
+       geom->border = border_pixels;
+       geom->separator = separator_pixels;

 }
 
 /* allocate an item */
 static struct Item *
 }
 
 /* allocate an item */
 static struct Item *

-allocitem(const char *label, const char *output)
+allocitem(const char *label, const char *output, char *file)

 {
        struct Item *item;
 
        if ((item = malloc(sizeof *item)) == NULL)
                err(1, "malloc");
 {
        struct Item *item;
 
        if ((item = malloc(sizeof *item)) == NULL)
                err(1, "malloc");

-       if (*label == '\0') {
+       if (label == NULL) {

                item->label = NULL;
                item->output = NULL;
        } else {
                if ((item->label = strdup(label)) == NULL)
                        err(1, "strdup");
                item->label = NULL;
                item->output = NULL;
        } else {
                if ((item->label = strdup(label)) == NULL)
                        err(1, "strdup");

-               if ((item->output = strdup(output)) == NULL)
+               if (label == output) {
+                       item->output = item->label;
+               } else {
+                       if ((item->output = strdup(output)) == NULL)
+                               err(1, "strdup");
+               }
+       }
+       if (file == NULL) {
+               item->file = NULL;
+       } else {
+               if ((item->file = strdup(file)) == NULL)

                        err(1, "strdup");
        }
        item->y = 0;
                        err(1, "strdup");
        }
        item->y = 0;

-       item->h = item->label ? geom.itemh : geom.separator;
+       item->h = 0;

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

+       item->icon = NULL;

 
        return item;
 }
 
        return item;
 }


@@ -283,186 +329,261 @@ 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 = geom.itemw;
-       menu->h = 0;    /* calculated by calcmenu() */
-       menu->x = 0;    /* calculated by calcmenu() */
-       menu->y = 0;    /* calculated by calcmenu() */
+       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->level = level;
 
        menu->level = level;
 

-       swa.override_redirect = True;
+       swa.override_redirect = (wflag) ? False : True;

        swa.background_pixel = dc.normal[ColorBG].pixel;
        swa.border_pixel = dc.border.pixel;
        swa.save_under = True;  /* pop-up windows should save_under*/
        swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask
                       | PointerMotionMask | LeaveWindowMask;
        swa.background_pixel = dc.normal[ColorBG].pixel;
        swa.border_pixel = dc.border.pixel;
        swa.save_under = True;  /* pop-up windows should save_under*/
        swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask
                       | PointerMotionMask | LeaveWindowMask;

-       menu->win = XCreateWindow(dpy, rootwin, 0, 0, geom.itemw, geom.itemh, geom.border,
+       if (wflag)
+               swa.event_mask |= StructureNotifyMask;
+       menu->win = XCreateWindow(dpy, rootwin, 0, 0, 1, 1, 0,

                                  CopyFromParent, CopyFromParent, CopyFromParent,
                                  CWOverrideRedirect | CWBackPixel |
                                  CWBorderPixel | CWEventMask | CWSaveUnder,
                                  &swa);
 
                                  CopyFromParent, CopyFromParent, CopyFromParent,
                                  CWOverrideRedirect | CWBackPixel |
                                  CWBorderPixel | CWEventMask | CWSaveUnder,
                                  &swa);
 

+       XSetWMProtocols(dpy, menu->win, &wmdelete, 1);
+

        return menu;
 }
 
        return menu;
 }
 

-/* create menus and items from the stdin */
+/* build the menu tree */

 static struct Menu *
 static struct Menu *

-parsestdin(void)
+buildmenutree(unsigned level, const char *label, const char *output, char *file)

 {
 {

-       char *s, buf[BUFSIZ];
-       char *label, *output;
-       unsigned level = 0;
+       static struct Menu *prevmenu = NULL;    /* menu the previous item was added to */
+       static struct Menu *rootmenu = NULL;    /* menu to be returned */
+       struct Item *curritem = NULL;           /* item currently being read */
+       struct Item *item;                      /* dummy item for loops */
+       struct Menu *menu;                      /* dummy menu for loops */

        unsigned i;
        unsigned i;

-       struct Item *curritem = NULL;   /* item currently being read */
-       struct Menu *prevmenu = NULL;   /* menu the previous item was added to */
-       struct Item *item;              /* dummy item for loops */
-       struct Menu *menu;              /* dummy menu for loops */
-       struct Menu *rootmenu;          /* menu to be returned */
-
-       rootmenu = NULL;
-
-       while (fgets(buf, BUFSIZ, stdin) != NULL) {
-               level = 0;
-               s = buf;
-
-               while (*s == '\t') {
-                       level++;
-                       s++;
-               }
-
-               label = output = s;

 
 

-               while (*s != '\0' && *s != '\t' && *s != '\n')
-                       s++;
+       /* create the item */
+       curritem = allocitem(label, output, file);
+
+       /* put the item in the menu tree */
+       if (prevmenu == NULL) {                 /* there is no menu yet */
+               menu = allocmenu(NULL, curritem, level);
+               rootmenu = menu;
+               prevmenu = menu;
+               curritem->prev = NULL;
+       } else if (level < prevmenu->level) {   /* item is continuation of a parent menu */
+               /* go up the menu tree until find the menu this item continues */
+               for (menu = prevmenu, i = level;
+                         menu != NULL && i != prevmenu->level;
+                         menu = menu->parent, i++)
+                       ;
+               if (menu == NULL)
+                       errx(1, "reached NULL menu");

 
 

-               while (*s == '\t')
-                       *s++ = '\0';
+               /* find last item in the new menu */
+               for (item = menu->list; item->next != NULL; item = item->next)
+                       ;

 
 

-               if (*s != '\0' && *s != '\n')
-                       output = s;
+               prevmenu = menu;
+               item->next = curritem;
+               curritem->prev = item;
+       } else if (level == prevmenu->level) {  /* item is a continuation of current menu */
+               /* find last item in the previous menu */
+               for (item = prevmenu->list; item->next != NULL; item = item->next)
+                       ;

 
 

-               while (*s != '\0' && *s != '\n')
-                       s++;
+               item->next = curritem;
+               curritem->prev = item;
+       } else if (level > prevmenu->level) {   /* item begins a new menu */
+               menu = allocmenu(prevmenu, curritem, level);

 
 

-               if (*s == '\n')
-                       *s = '\0';
+               /* find last item in the previous menu */
+               for (item = prevmenu->list; item->next != NULL; item = item->next)
+                       ;

 
 

-               curritem = allocitem(label, output);
+               prevmenu = menu;
+               menu->caller = item;
+               item->submenu = menu;
+               curritem->prev = NULL;
+       }

 
 

-               if (prevmenu == NULL) {                 /* there is no menu yet */
-                        menu = allocmenu(NULL, curritem, level);
-                        rootmenu = menu;
-                        prevmenu = menu;
-                        curritem->prev = NULL;
-                        curritem->next = NULL;
-               } else if (level < prevmenu->level) {   /* item is continuation of a parent menu*/
-                       for (menu = prevmenu, i = level;
-                             menu != NULL && i < prevmenu->level;
-                             menu = menu->parent, i++)
-                               ;
+       return rootmenu;
+}

 
 

-                       if (menu == NULL)
-                               errx(1, "reached NULL menu");
+/* create menus and items from the stdin */
+static struct Menu *
+parsestdin(void)
+{
+       struct Menu *rootmenu;
+       char *s, buf[BUFSIZ];
+       char *file, *label, *output;
+       unsigned level = 0;

 
 

-                       for (item = menu->list; item->next != NULL; item = item->next)
-                               ;
+       rootmenu = NULL;

 
 

-                       item->next = curritem;
+       while (fgets(buf, BUFSIZ, stdin) != NULL) {
+               /* get the indentation level */
+               level = strspn(buf, "\t");
+
+               /* get the label */
+               s = level + buf;
+               label = strtok(s, "\t\n");
+
+               /* get the filename */
+               file = NULL;
+               if (label != NULL && strncmp(label, "IMG:", 4) == 0) {
+                       file = label + 4;
+                       label = strtok(NULL, "\t\n");
+               }

 
 

-                       curritem->prev = item;
-                       curritem->next = NULL;
+               /* get the output */
+               output = strtok(NULL, "\n");
+               if (output == NULL) {
+                       output = label;
+               } else {
+                       while (*output == '\t')
+                               output++;
+               }

 
 

-                       prevmenu = menu;
-               } else if (level == prevmenu->level) {  /* item is a continuation of current menu */
-                       for (item = prevmenu->list; item->next != NULL; item = item->next)
-                               ;
-                       item->next = curritem;
+               rootmenu = buildmenutree(level, label, output, file);
+       }

 
 

-                       curritem->prev = item;
-                       curritem->next = NULL;
+       return rootmenu;
+}

 
 

-               } else if (level > prevmenu->level) {   /* item begins a new menu */
-                       menu = allocmenu(prevmenu, curritem, level);
+/* load and scale icon */
+static Imlib_Image
+loadicon(const char *file, int size)
+{
+       Imlib_Image icon;
+       int width;
+       int height;
+       int imgsize;

 
 

-                       for (item = prevmenu->list; item->next != NULL; item = item->next)
-                               ;
+       icon = imlib_load_image(file);
+       if (icon == NULL)
+               errx(1, "cannot load icon %s", file);

 
 

-                       item->submenu = menu;
-                       menu->caller = item;
+       imlib_context_set_image(icon);

 
 

-                       curritem->prev = NULL;
-                       curritem->next = NULL;
+       width = imlib_image_get_width();
+       height = imlib_image_get_height();
+       imgsize = MIN(width, height);

 
 

-                       prevmenu = menu;
-               }
-       }
+       icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, size, size);

 
 

-       return rootmenu;
+       return icon;

 }
 
 }
 

-/* recursivelly calculate menu geometry and set window hints */
+/* setup the size of a menu and the position of its items */

 static void
 static void

-calcmenu(struct Menu *menu)
+setupmenusize(struct Geometry *geom, struct Menu *menu)

 {
 {

-       static XClassHint classh = {PROGNAME, PROGNAME};
-       XWindowChanges changes;
-       XSizeHints sizeh;

        XGlyphInfo ext;
        struct Item *item;
        int labelwidth;
 
        XGlyphInfo ext;
        struct Item *item;
        int labelwidth;
 

-       /* calculate items positions and menu width and height */
-       menu->w = geom.itemw;
+       menu->w = geom->itemw;

        for (item = menu->list; item != NULL; item = item->next) {
                item->y = menu->h;
        for (item = menu->list; item != NULL; item = item->next) {
                item->y = menu->h;

+

                if (item->label == NULL)   /* height for separator item */
                if (item->label == NULL)   /* height for separator item */

-                       menu->h += geom.separator;
+                       item->h = geom->separator;

                else
                else

-                       menu->h += geom.itemh;
+                       item->h = geom->itemh;
+               menu->h += item->h;

 
 

+               /* get length of item->label rendered in the font */

                XftTextExtentsUtf8(dpy, dc.font, (XftChar8 *)item->label,
                                   item->labellen, &ext);
                XftTextExtentsUtf8(dpy, dc.font, (XftChar8 *)item->label,
                                   item->labellen, &ext);

-               labelwidth = ext.xOff + dc.font->height * 2;
+
+               /* set menu width */
+               labelwidth = ext.xOff + item->h * 2;

                menu->w = MAX(menu->w, labelwidth);
                menu->w = MAX(menu->w, labelwidth);

+
+               /* create icon */
+               if (item->file != NULL)
+                       item->icon = loadicon(item->file, item->h - iconpadding * 2);

        }
        }

+}

 
 

-       /* calculate menu's x and y positions */
+/* setup the position of a menu */
+static void
+setupmenupos(struct Geometry *g, struct Menu *menu)
+{
+       static struct Geometry *geom = NULL;
+       int width, height;
+
+       /*
+        * Save the geometry so functions can call setupmenupos() without
+        * having to know the geometry.
+        */
+       if (g != NULL)
+               geom = g;
+
+       width = menu->w + geom->border * 2;
+       height = menu->h + geom->border * 2;

        if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */
        if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */

-               if (geom.screenw - geom.cursx >= menu->w)
-                       menu->x = geom.cursx;
-               else if (geom.cursx > menu->w)
-                       menu->x = geom.cursx - menu->w;
-
-               if (geom.screenh - geom.cursy >= menu->h)
-                       menu->y = geom.cursy;
-               else if (geom.screenh > menu->h)
-                       menu->y = geom.screenh - menu->h;
+               if (geom->screenw - geom->cursx >= menu->w)
+                       menu->x = geom->cursx;
+               else if (geom->cursx > width)
+                       menu->x = geom->cursx - width;
+
+               if (geom->screenh - geom->cursy >= height)
+                       menu->y = geom->cursy;
+               else if (geom->screenh > height)
+                       menu->y = geom->screenh - height;

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

-               if (geom.screenw - (menu->parent->x + menu->parent->w + geom.border) >= menu->w)
-                       menu->x = menu->parent->x + menu->parent->w + geom.border;
-               else if (menu->parent->x > menu->w + geom.border)
-                       menu->x = menu->parent->x - menu->w - geom.border;
+               if (geom->screenw - (menu->parent->x + menu->parent->w + geom->border) >= width)
+                       menu->x = menu->parent->x + menu->parent->w + geom->border;
+               else if (menu->parent->x > menu->w + geom->border)
+                       menu->x = menu->parent->x - menu->w - geom->border;

 
 

-               if (geom.screenh - (menu->caller->y + menu->parent->y) > menu->h)
+               if (geom->screenh - (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 (geom.screenh - menu->parent->y > menu->h)
+               else if (geom->screenh - menu->parent->y > height)

                        menu->y = menu->parent->y;
                        menu->y = menu->parent->y;

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

        }
        }

+}
+
+/* recursivelly setup menu configuration and its pixmap */
+static void
+setupmenu(struct Geometry *geom, struct Menu *menu, XClassHint *classh)
+{
+       struct Item *item;
+       XWindowChanges changes;
+       XSizeHints sizeh;
+       XTextProperty wintitle;
+
+       /* setup size and position of menus */
+       setupmenusize(geom, menu);
+       setupmenupos(geom, menu);

 
        /* update menu geometry */
 
        /* update menu geometry */

+       changes.border_width = geom->border;

        changes.height = menu->h;
        changes.width = menu->w;
        changes.x = menu->x;
        changes.y = menu->y;
        changes.height = menu->h;
        changes.width = menu->w;
        changes.x = menu->x;
        changes.y = menu->y;

-       XConfigureWindow(dpy, menu->win, CWWidth | CWHeight | CWX | CWY, &changes);
+       XConfigureWindow(dpy, menu->win, CWBorderWidth | CWWidth | CWHeight | CWX | CWY, &changes);
+
+       /* set window title (used if wflag is on) */
+       if (menu->parent == NULL) {
+               XStringListToTextProperty(&classh->res_name, 1, &wintitle);
+       } else {
+               XStringListToTextProperty(&menu->caller->output, 1, &wintitle);
+       }

 
        /* set window manager hints */
        sizeh.flags = PMaxSize | PMinSize;
        sizeh.min_width = sizeh.max_width = menu->w;
        sizeh.min_height = sizeh.max_height = menu->h;
 
        /* set window manager hints */
        sizeh.flags = PMaxSize | PMinSize;
        sizeh.min_width = sizeh.max_width = menu->w;
        sizeh.min_height = sizeh.max_height = menu->h;

-       XSetWMProperties(dpy, menu->win, NULL, NULL, NULL, 0, &sizeh,
-                        NULL, &classh);
+       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,
 
        /* create pixmap and XftDraw */
        menu->pixmap = XCreatePixmap(dpy, menu->win, menu->w, menu->h,


@@ -472,7 +593,7 @@ calcmenu(struct Menu *menu)
        /* calculate positions of submenus */
        for (item = menu->list; item != NULL; item = item->next) {
                if (item->submenu != NULL)
        /* calculate positions of submenus */
        for (item = menu->list; item != NULL; item = item->next) {
                if (item->submenu != NULL)

-                       calcmenu(item->submenu);
+                       setupmenu(geom, item->submenu, classh);

        }
 }
 
        }
 }
 


@@ -555,7 +676,8 @@ mapmenu(struct Menu *currmenu)
        /* if this is the first time mapping, skip calculations */
        if (prevmenu == NULL) {
                XMapWindow(dpy, currmenu->win);
        /* if this is the first time mapping, skip calculations */
        if (prevmenu == NULL) {
                XMapWindow(dpy, currmenu->win);

-               goto done;
+               prevmenu = currmenu;
+               return;

        }
 
        /* find lowest common ancestor menu */
        }
 
        /* find lowest common ancestor menu */


@@ -584,10 +706,15 @@ mapmenu(struct Menu *currmenu)
 
        /* map menus from currmenu (inclusive) until lcamenu (exclusive) */
        for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
 
        /* map menus from currmenu (inclusive) until lcamenu (exclusive) */
        for (menu = currmenu; menu != lcamenu; menu = menu->parent) {

+
+               if (wflag) {
+                       setupmenupos(NULL, menu);
+                       XMoveWindow(dpy, menu->win, menu->x, menu->y);
+               }
+

                XMapWindow(dpy, menu->win);
        }
 
                XMapWindow(dpy, menu->win);
        }
 

-done:

        prevmenu = currmenu;
 }
 
        prevmenu = currmenu;
 }
 


@@ -595,14 +722,12 @@ done:
 static void
 drawseparator(struct Menu *menu, struct Item *item)
 {
 static void
 drawseparator(struct Menu *menu, struct Item *item)
 {

-       int linex, liney, linew;
+       int y;

 
 

-       linex = dc.font->height;
-       liney = item->y + item->h/2;
-       linew = menu->w - dc.font->height;
+       y = item->y + item->h/2;

 
        XSetForeground(dpy, dc.gc, dc.separator.pixel);
 
        XSetForeground(dpy, dc.gc, dc.separator.pixel);

-       XDrawLine(dpy, menu->pixmap, dc.gc, linex, liney, linew, liney);
+       XDrawLine(dpy, menu->pixmap, dc.gc, 0, y, menu->w, y);

 }
 
 /* draw regular item */
 }
 
 /* draw regular item */


@@ -611,16 +736,16 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color)
 {
        int x, y;
 
 {
        int x, y;
 

-       x = 0 + dc.font->height;
-       y = item->y + item->h/2 + dc.font->ascent/2 - 1;
+       x = item->h;
+       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, item->label, item->labellen);
 
        /* draw triangle, if item contains a submenu */
        if (item->submenu != NULL) {
        XSetForeground(dpy, dc.gc, color[ColorFG].pixel);
        XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font,
                       x, y, item->label, item->labellen);
 
        /* draw triangle, if item contains a submenu */
        if (item->submenu != NULL) {

-               x = menu->w - dc.font->height/2 - triangle_width/2;
-               y = item->y + item->h/2 - triangle_height/2 - 1;
+               x = menu->w - (item->h + triangle_width + 1) / 2;
+               y = item->y + (item->h - triangle_height + 1) / 2;

 
                XPoint triangle[] = {
                        {x, y},
 
                XPoint triangle[] = {
                        {x, y},


@@ -632,6 +757,15 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color)
                XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle),
                             Convex, CoordModeOrigin);
        }
                XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle),
                             Convex, CoordModeOrigin);
        }

+
+       /* draw icon */
+       if (item->file != NULL) {
+               x = iconpadding;
+               y = item->y + 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 */
 }
 
 /* draw items of the current menu and of its ancestors */


@@ -801,34 +935,64 @@ selectitem:
                        currmenu->selected = NULL;
                        drawmenu(currmenu);
                        break;
                        currmenu->selected = NULL;
                        drawmenu(currmenu);
                        break;

+               case ConfigureNotify:
+                       menu = getmenu(currmenu, ev.xconfigure.window);
+                       if (menu == NULL)
+                               break;
+                       menu->x = ev.xconfigure.x;
+                       menu->y = ev.xconfigure.y;
+                       break;
+               case ClientMessage:
+                       /* user closed window */
+                       menu = getmenu(currmenu, ev.xclient.window);
+                       if (menu->parent == NULL)
+                               return;     /* closing the root menu closes the program */
+                       currmenu = menu->parent;
+                       mapmenu(currmenu);
+                       break;

                }
        }
 }
 
 /* recursivelly free pixmaps and destroy windows */
 static void
                }
        }
 }
 
 /* recursivelly free pixmaps and destroy windows */
 static void

-freewindow(struct Menu *menu)
+freemenu(struct Menu *menu)

 {
        struct Item *item;
 {
        struct Item *item;

+       struct Item *tmp;

 
 

-       for (item = menu->list; item != NULL; item = item->next)
+       item = menu->list;
+       while (item != NULL) {

                if (item->submenu != NULL)
                if (item->submenu != NULL)

-                       freewindow(item->submenu);
+                       freemenu(item->submenu);
+               tmp = item;
+               if (tmp->label != tmp->output)
+                       free(tmp->label);
+               free(tmp->output);
+               if (tmp->file != NULL) {
+                       free(tmp->file);
+                       if (tmp->icon != NULL) {
+                               imlib_context_set_image(tmp->icon);
+                               imlib_free_image();
+                       }
+               }
+               item = item->next;
+               free(tmp);
+       }

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

+       free(menu);

 }
 
 /* cleanup and exit */
 static void
 }
 
 /* cleanup and exit */
 static void

-cleanup(struct Menu *rootmenu)
+cleanup(void)

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

-       freewindow(rootmenu);
-

        XftColorFree(dpy, visual, colormap, &dc.normal[ColorBG]);
        XftColorFree(dpy, visual, colormap, &dc.normal[ColorFG]);
        XftColorFree(dpy, visual, colormap, &dc.selected[ColorBG]);
        XftColorFree(dpy, visual, colormap, &dc.normal[ColorBG]);
        XftColorFree(dpy, visual, colormap, &dc.normal[ColorFG]);
        XftColorFree(dpy, visual, colormap, &dc.selected[ColorBG]);


@@ -844,6 +1008,6 @@ cleanup(struct Menu *rootmenu)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

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

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