Improved README

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index 82617d7..273f690 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -9,6 +9,7 @@
 #include <X11/XKBlib.h>
 #include <X11/Xft/Xft.h>
 
 #include <X11/XKBlib.h>
 #include <X11/Xft/Xft.h>
 

+#define PROGNAME "xmenu"

 #define ITEMPREV 0
 #define ITEMNEXT 1
 
 #define ITEMPREV 0
 #define ITEMNEXT 1
 


@@ -24,7 +25,8 @@ enum {ColorFG, ColorBG, ColorLast};
 struct DC {
        XftColor normal[ColorLast];
        XftColor selected[ColorLast];
 struct DC {
        XftColor normal[ColorLast];
        XftColor selected[ColorLast];

-       XftColor decoration[ColorLast];
+       XftColor border;
+       XftColor separator;

 
        Drawable d;
        GC gc;
 
        Drawable d;
        GC gc;


@@ -32,7 +34,7 @@ struct DC {
 };
 
 /* menu geometry structure */
 };
 
 /* menu geometry structure */

-struct Geometry {
+struct MenuGeometry {

        int itemb;      /* item border */
        int itemw;      /* item width */
        int itemh;      /* item height */
        int itemb;      /* item border */
        int itemw;      /* item width */
        int itemh;      /* item height */


@@ -76,13 +78,17 @@ static void getcolor(const char *s, XftColor *color);
 static void getresources(void);
 static void setupdc(void);
 static void setupgeom(void);
 static void getresources(void);
 static void setupdc(void);
 static void setupgeom(void);

-static void setupgrab(void);

 static struct Item *allocitem(const char *label, const char *output);
 static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level);
 static struct Item *allocitem(const char *label, const char *output);
 static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level);

-static void getmenuitem(Window win, int y, struct Menu **menu_ret, struct Item **item_ret);
+static struct Menu *getmenu(Window win);
+static struct Item *getitem(struct Menu *menu, int y);
+static void drawseparator(struct Menu *menu, struct Item *item);
+static void drawitem(struct Menu *menu, struct Item *item, XftColor *color);

 static void drawmenu(void);
 static void calcscreengeom(void);
 static void calcmenu(struct Menu *menu);
 static void drawmenu(void);
 static void calcscreengeom(void);
 static void calcmenu(struct Menu *menu);

+static void grabpointer(void);
+static void grabkeyboard(void);

 static void setcurrmenu(struct Menu *currmenu_new);
 static void parsestdin(void);
 static void run(void);
 static void setcurrmenu(struct Menu *currmenu_new);
 static void parsestdin(void);
 static void run(void);


@@ -97,17 +103,12 @@ static Visual *visual;
 static Window rootwin;
 static int screen;
 static struct DC dc;
 static Window rootwin;
 static int screen;
 static struct DC dc;

+static struct ScreenGeometry screengeom;

 
 /* menu variables */
 static struct Menu *rootmenu = NULL;
 static struct Menu *currmenu = NULL;
 
 /* menu variables */
 static struct Menu *rootmenu = NULL;
 static struct Menu *currmenu = NULL;

-
-/* geometry variables */
-static struct Geometry geom;
-static struct ScreenGeometry screengeom;
-
-/* flag variables */
-static Bool override_redirect = True;
+static struct MenuGeometry geom;

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


@@ -116,11 +117,8 @@ main(int argc, char *argv[])
 {
        int ch;
 
 {
        int ch;
 

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

                switch (ch) {
                switch (ch) {

-               case 'w':
-                       override_redirect = False;
-                       break;

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


@@ -141,8 +139,6 @@ main(int argc, char *argv[])
        getresources();
        setupdc();
        setupgeom();
        getresources();
        setupdc();
        setupgeom();

-       if (override_redirect)
-               setupgrab();

 
        /* generate menus and recalculate them */
        parsestdin();
 
        /* generate menus and recalculate them */
        parsestdin();


@@ -151,15 +147,14 @@ main(int argc, char *argv[])
        calcscreengeom();
        calcmenu(rootmenu);
 
        calcscreengeom();
        calcmenu(rootmenu);
 

-       /* map root menu */
-       currmenu = rootmenu;
-       XMapWindow(dpy, rootmenu->win);
+       /* grab mouse and keyboard */
+       grabpointer();
+       grabkeyboard();

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

-

        return 0;
 }
 
        return 0;
 }
 


@@ -169,44 +164,44 @@ getresources(void)
 {
        char *xrm;
        long n;
 {
        char *xrm;
        long n;

+       char *type;
+       XrmDatabase xdb;
+       XrmValue xval;

 
        XrmInitialize();
 
        XrmInitialize();

-       if ((xrm = XResourceManagerString(dpy))) {
-               char *type;
-               XrmDatabase xdb;
-               XrmValue xval;
-
-               xdb = XrmGetStringDatabase(xrm);
-
-               if (XrmGetResource(xdb, "xmenu.menuborder", "*", &type, &xval) == True)
-                       if ((n = strtol(xval.addr, NULL, 10)) > 0)
-                               menuborder = n;
-               if (XrmGetResource(xdb, "xmenu.separatorsize", "*", &type, &xval) == True)
-                       if ((n = strtol(xval.addr, NULL, 10)) > 0)
-                               separatorsize = n;
-               if (XrmGetResource(xdb, "xmenu.itemborder", "*", &type, &xval) == True)
-                       if ((n = strtol(xval.addr, NULL, 10)) > 0)
-                               itemborder = n;
-               if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True)
-                       if ((n = strtol(xval.addr, NULL, 10)) > 0)
-                               width = n;
-               if (XrmGetResource(xdb, "xmenu.background", "*", &type, &xval) == True)
-                       background = strdup(xval.addr);
-               if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True)
-                       foreground = strdup(xval.addr);
-               if (XrmGetResource(xdb, "xmenu.selbackground", "*", &type, &xval) == True)
-                       selbackground = strdup(xval.addr);
-               if (XrmGetResource(xdb, "xmenu.selforeground", "*", &type, &xval) == True)
-                       selforeground = strdup(xval.addr);
-               if (XrmGetResource(xdb, "xmenu.separator", "*", &type, &xval) == True)
-                       separator = strdup(xval.addr);
-               if (XrmGetResource(xdb, "xmenu.border", "*", &type, &xval) == True)
-                       border = strdup(xval.addr);
-               if (XrmGetResource(xdb, "xmenu.font", "*", &type, &xval) == True)
-                       font = strdup(xval.addr);
-
-               XrmDestroyDatabase(xdb);
-       }
+       if ((xrm = XResourceManagerString(dpy)) == NULL)
+               return;
+
+       xdb = XrmGetStringDatabase(xrm);
+
+       if (XrmGetResource(xdb, "xmenu.borderWidth", "*", &type, &xval) == True)
+               if ((n = strtol(xval.addr, NULL, 10)) > 0)
+                       border_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 ((n = strtol(xval.addr, NULL, 10)) > 0)
+                       padding_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.background", "*", &type, &xval) == True)
+               background_color = strdup(xval.addr);
+       if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True)
+               foreground_color = strdup(xval.addr);
+       if (XrmGetResource(xdb, "xmenu.selbackground", "*", &type, &xval) == True)
+               selbackground_color = strdup(xval.addr);
+       if (XrmGetResource(xdb, "xmenu.selforeground", "*", &type, &xval) == True)
+               selforeground_color = strdup(xval.addr);
+       if (XrmGetResource(xdb, "xmenu.separator", "*", &type, &xval) == True)
+               separator_color = strdup(xval.addr);
+       if (XrmGetResource(xdb, "xmenu.border", "*", &type, &xval) == True)
+               border_color = strdup(xval.addr);
+       if (XrmGetResource(xdb, "xmenu.font", "*", &type, &xval) == True)
+               font = strdup(xval.addr);
+
+       XrmDestroyDatabase(xdb);

 }
 
 /* get color from color string */
 }
 
 /* get color from color string */


@@ -222,18 +217,18 @@ static void
 setupdc(void)
 {
        /* get color pixels */
 setupdc(void)
 {
        /* get color pixels */

-       getcolor(background,    &dc.normal[ColorBG]);
-       getcolor(foreground,    &dc.normal[ColorFG]);
-       getcolor(selbackground, &dc.selected[ColorBG]);
-       getcolor(selforeground, &dc.selected[ColorFG]);
-       getcolor(separator,     &dc.decoration[ColorBG]);
-       getcolor(border,        &dc.decoration[ColorFG]);
+       getcolor(background_color,    &dc.normal[ColorBG]);
+       getcolor(foreground_color,    &dc.normal[ColorFG]);
+       getcolor(selbackground_color, &dc.selected[ColorBG]);
+       getcolor(selforeground_color, &dc.selected[ColorFG]);
+       getcolor(separator_color,     &dc.separator);
+       getcolor(border_color,        &dc.border);

 
        /* try to get font */
        if ((dc.font = XftFontOpenName(dpy, screen, font)) == NULL)
                errx(1, "cannot load font");
 
 
        /* try to get font */
        if ((dc.font = XftFontOpenName(dpy, screen, font)) == NULL)
                errx(1, "cannot load font");
 

-       /* create GC */
+       /* create common GC */

        dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
 }
 
        dc.gc = XCreateGC(dpy, rootwin, 0, NULL);
 }
 


@@ -241,24 +236,11 @@ setupdc(void)
 static void
 setupgeom(void)
 {
 static void
 setupgeom(void)
 {

-       geom.itemb = itemborder;
-       geom.itemh = dc.font->height + itemborder * 2;
-       geom.itemw = width;
-       geom.border = menuborder;
-       geom.separator = separatorsize;
-}
-
-/* grab pointer */
-static void
-setupgrab(void)
-{
-       if (XGrabPointer(dpy, rootwin, True, ButtonPressMask,
-                        GrabModeAsync, GrabModeAsync, None,
-                        None, CurrentTime) != GrabSuccess)
-               errx(1, "cannot grab pointer");
-       if (XGrabKeyboard(dpy, rootwin, True, GrabModeAsync,
-                         GrabModeAsync, CurrentTime) != GrabSuccess)
-               errx(1, "cannot grab keyboard");
+       geom.itemb = padding_pixels;
+       geom.itemh = dc.font->height + padding_pixels * 2;
+       geom.itemw = width_pixels;
+       geom.border = border_pixels;
+       geom.separator = separator_pixels;

 }
 
 /* allocate an item */
 }
 
 /* allocate an item */


@@ -309,14 +291,16 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
        menu->y = 0;    /* calculated by calcmenu() */
        menu->level = level;
 
        menu->y = 0;    /* calculated by calcmenu() */
        menu->level = level;
 

-       swa.override_redirect = override_redirect;
-       swa.background_pixel = dc.decoration[ColorBG].pixel;
-       swa.border_pixel = dc.decoration[ColorFG].pixel;
+       swa.override_redirect = 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;
        menu->win = XCreateWindow(dpy, rootwin, 0, 0, geom.itemw, geom.itemh, geom.border,
                                  CopyFromParent, CopyFromParent, CopyFromParent,
        swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask
                       | PointerMotionMask | LeaveWindowMask;
        menu->win = XCreateWindow(dpy, rootwin, 0, 0, geom.itemw, geom.itemh, geom.border,
                                  CopyFromParent, CopyFromParent, CopyFromParent,

-                                 CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWEventMask,
+                                 CWOverrideRedirect | CWBackPixel |
+                                 CWBorderPixel | CWEventMask | CWSaveUnder,

                                  &swa);
 
        return menu;
                                  &swa);
 
        return menu;


@@ -428,10 +412,11 @@ calcscreengeom(void)
        screengeom.screenh = DisplayHeight(dpy, screen);
 }
 
        screengeom.screenh = DisplayHeight(dpy, screen);
 }
 

-/* recursivelly calculate height and position of the menus */
+/* recursivelly calculate menu geometry and set window hints */

 static void
 calcmenu(struct Menu *menu)
 {
 static void
 calcmenu(struct Menu *menu)
 {

+       static XClassHint classh = {PROGNAME, PROGNAME};

        XWindowChanges changes;
        XSizeHints sizeh;
        XGlyphInfo ext;
        XWindowChanges changes;
        XSizeHints sizeh;
        XGlyphInfo ext;


@@ -465,18 +450,13 @@ calcmenu(struct Menu *menu)
                else if (screengeom.screenh > menu->h)
                        menu->y = screengeom.screenh - menu->h;
        } else {                    /* else, calculate in respect to parent menu */
                else if (screengeom.screenh > menu->h)
                        menu->y = screengeom.screenh - menu->h;
        } else {                    /* else, calculate in respect to parent menu */

-
-               /* search for the item in parent menu that generates this menu */
-               for (item = menu->parent->list; item->submenu != menu; item = item->next)
-                       ;
-

                if (screengeom.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 (screengeom.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 (screengeom.screenh - (item->y + menu->parent->y) > menu->h)
-                       menu->y = item->y + menu->parent->y;
+               if (screengeom.screenh - (menu->caller->y + menu->parent->y) > menu->h)
+                       menu->y = menu->caller->y + menu->parent->y;

                else if (screengeom.screenh - menu->parent->y > menu->h)
                        menu->y = menu->parent->y;
                else if (screengeom.screenh > menu->h)
                else if (screengeom.screenh - menu->parent->y > menu->h)
                        menu->y = menu->parent->y;
                else if (screengeom.screenh > menu->h)


@@ -490,11 +470,12 @@ calcmenu(struct Menu *menu)
        changes.y = menu->y;
        XConfigureWindow(dpy, menu->win, CWWidth | CWHeight | CWX | CWY, &changes);
 
        changes.y = menu->y;
        XConfigureWindow(dpy, menu->win, CWWidth | CWHeight | CWX | CWY, &changes);
 

-       /* set window manager size hints */
+       /* set window manager hints */

        sizeh.flags = PMaxSize | PMinSize;
        sizeh.min_width = sizeh.max_width = menu->w;
        sizeh.min_height = sizeh.max_height = menu->h;
        sizeh.flags = PMaxSize | PMinSize;
        sizeh.min_width = sizeh.max_width = menu->w;
        sizeh.min_height = sizeh.max_height = menu->h;

-       XSetWMNormalHints(dpy, menu->win, &sizeh);
+       XSetWMProperties(dpy, menu->win, NULL, 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,


@@ -508,28 +489,66 @@ calcmenu(struct Menu *menu)
        }
 }
 
        }
 }
 

-/* get menu and item of given window and position */
+/* try to grab pointer, we may have to wait for another process to ungrab */

 static void
 static void

-getmenuitem(Window win, int y,
-            struct Menu **menu_ret, struct Item **item_ret)
+grabpointer(void)

 {
 {

-       struct Menu *menu = NULL;
-       struct Item *item = NULL;
+       struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
+       int i;
+
+       for (i = 0; i < 1000; i++) {
+               if (XGrabPointer(dpy, rootwin, True, ButtonPressMask,
+                                GrabModeAsync, GrabModeAsync, None,
+                                None, CurrentTime) == GrabSuccess)
+                       return;
+               nanosleep(&ts, NULL);
+       }
+       errx(1, "cannot grab keyboard");
+}

 
 

-       for (menu = currmenu; menu != NULL; menu = menu->parent) {
-               if (menu->win == win) {
-                       for (item = menu->list; item != NULL; item = item->next) {
-                               if (y >= item->y && y <= item->y + item->h) {
-                                       goto done;
-                               }
-                       }
-               }
+/* try to grab keyboard, we may have to wait for another process to ungrab */
+static void
+grabkeyboard(void)
+{
+       struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
+       int i;
+
+       for (i = 0; i < 1000; i++) {
+               if (XGrabKeyboard(dpy, rootwin, True, GrabModeAsync,
+                                 GrabModeAsync, CurrentTime) == GrabSuccess)
+                       return;
+               nanosleep(&ts, NULL);

        }
        }

+       errx(1, "cannot grab keyboard");
+}
+
+/* get menu of given window */
+static struct Menu *
+getmenu(Window win)
+{
+       struct Menu *menu;
+
+       for (menu = currmenu; menu != NULL; menu = menu->parent)
+               if (menu->win == win)
+                       return menu;
+
+       return NULL;
+}
+
+/* get item of given menu and position */
+static struct Item *
+getitem(struct Menu *menu, int y)
+{
+       struct Item *item;

 
 

+       if (menu == NULL)
+               return NULL;

 
 

-done:
-       *menu_ret = menu;
-       *item_ret = item;
+       for (item = menu->list; item != NULL; item = item->next)
+               if (y >= item->y && y <= item->y + item->h)
+                       return item;
+
+       return NULL;

 }
 
 /* set currentmenu to menu, umap previous menus and map current menu and its parents */
 }
 
 /* set currentmenu to menu, umap previous menus and map current menu and its parents */


@@ -542,33 +561,39 @@ setcurrmenu(struct Menu *currmenu_new)
        unsigned minlevel;      /* level of the closest to root menu */
        unsigned maxlevel;      /* level of the closest to root menu */
 
        unsigned minlevel;      /* level of the closest to root menu */
        unsigned maxlevel;      /* level of the closest to root menu */
 

+       /* do not update currmenu to itself */

        if (currmenu_new == currmenu)
                return;
 
        if (currmenu_new == currmenu)
                return;
 

+       /* if there was no currmenu, skip calculations */
+       if (currmenu == NULL) {
+               currmenu = currmenu_new;
+               XMapWindow(dpy, currmenu->win);
+               return;
+       }
+

        /* find lowest common ancestor menu */
        lcamenu = rootmenu;
        /* find lowest common ancestor menu */
        lcamenu = rootmenu;

-       if (currmenu != NULL) {
-               minlevel = MIN(currmenu_new->level, currmenu->level);
-               maxlevel = MAX(currmenu_new->level, currmenu->level);
-               if (currmenu_new->level == maxlevel) {
-                       menu = currmenu_new;
-                       menu_ = currmenu;
-               } else {
-                       menu = currmenu;
-                       menu_ = currmenu_new;
-               }
-               while (menu->level > minlevel)
-                       menu = menu->parent;
-
-               while (menu != menu_) {
-                       menu = menu->parent;
-                       menu_ = menu_->parent;
-               }
-               lcamenu = menu;
+       minlevel = MIN(currmenu_new->level, currmenu->level);
+       maxlevel = MAX(currmenu_new->level, currmenu->level);
+       if (currmenu_new->level == maxlevel) {
+               menu = currmenu_new;
+               menu_ = currmenu;
+       } else {
+               menu = currmenu;
+               menu_ = currmenu_new;
+       }
+       while (menu->level > minlevel)
+               menu = menu->parent;
+       while (menu != menu_) {
+               menu = menu->parent;
+               menu_ = menu_->parent;

        }
        }

+       lcamenu = menu;

 
        /* unmap menus from currmenu (inclusive) until lcamenu (exclusive) */
        for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
 
        /* unmap menus from currmenu (inclusive) until lcamenu (exclusive) */
        for (menu = currmenu; menu != lcamenu; menu = menu->parent) {

+               menu->selected = NULL;

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


@@ -578,9 +603,49 @@ setcurrmenu(struct Menu *currmenu_new)
        item = NULL;
        for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
                XMapWindow(dpy, menu->win);
        item = NULL;
        for (menu = currmenu; menu != lcamenu; menu = menu->parent) {
                XMapWindow(dpy, menu->win);

-               if (item != NULL)
-                       menu->selected = item;
-               item = menu->caller;
+       }
+}
+
+/* draw separator item */
+static void
+drawseparator(struct Menu *menu, struct Item *item)
+{
+       int linex, liney, linew;
+
+       linex = dc.font->height;
+       liney = item->y + item->h/2;
+       linew = menu->w - dc.font->height;
+
+       XSetForeground(dpy, dc.gc, dc.separator.pixel);
+       XDrawLine(dpy, menu->pixmap, dc.gc, linex, liney, linew, liney);
+}
+
+/* draw regular item */
+static void
+drawitem(struct Menu *menu, struct Item *item, XftColor *color)
+{
+       int x, y;
+
+       x = 0 + dc.font->height;
+       y = item->y + dc.font->height + geom.itemb / 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) {
+               x = menu->w - dc.font->height + geom.itemb - 1;
+               y = item->y + geom.itemh/2 - triangle_height/2 - 1;
+
+               XPoint triangle[] = {
+                       {x, y},
+                       {x + triangle_width, y + triangle_height/2},
+                       {x, y + triangle_height},
+                       {x, y}
+               };
+
+               XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle),
+                            Convex, CoordModeOrigin);

        }
 }
 
        }
 }
 


@@ -594,52 +659,26 @@ drawmenu(void)
        for (menu = currmenu; menu != NULL; menu = menu->parent) {
                for (item = menu->list; item != NULL; item = item->next) {
                        XftColor *color;
        for (menu = currmenu; menu != NULL; menu = menu->parent) {
                for (item = menu->list; item != NULL; item = item->next) {
                        XftColor *color;

-                       int labelx, labely;

 
                        /* determine item color */
 
                        /* determine item color */

-                       if (item == menu->selected)
+                       if (item == menu->selected && item->label != NULL)

                                color = dc.selected;
                        else
                                color = dc.normal;
 
                                color = dc.selected;
                        else
                                color = dc.normal;
 

-                       /* continue if item is a separator */
-                       if (item->label == NULL)
-                               continue;
-

                        /* draw item box */
                        XSetForeground(dpy, dc.gc, color[ColorBG].pixel);
                        /* draw item box */
                        XSetForeground(dpy, dc.gc, color[ColorBG].pixel);

-                       XDrawRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
-                                      menu->w, item->h);

                        XFillRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
                                       menu->w, item->h);
 
                        XFillRectangle(dpy, menu->pixmap, dc.gc, 0, item->y,
                                       menu->w, item->h);
 

-                       /* draw item label */
-                       labelx = 0 + dc.font->height;
-                       labely = item->y + dc.font->height + geom.itemb / 2;
-                       XSetForeground(dpy, dc.gc, color[ColorFG].pixel);
-                       XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font,
-                                         labelx, labely, item->label,
-                                         item->labellen);
-
-                       /* draw triangle, if item contains a submenu */
-                       if (item->submenu != NULL) {
-                               int trianglex = menu->w - dc.font->height + geom.itemb - 1;
-                               int triangley = item->y + (3 * item->h)/8 -1;
-
-                               XPoint triangle[] = {
-                                       {trianglex, triangley},
-                                       {trianglex + item->h/8 + 1, item->y + item->h/2},
-                                       {trianglex, triangley + item->h/4 + 2},
-                                       {trianglex, triangley}
-                               };
-
-                               XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle),
-                                            Convex, CoordModeOrigin);
-                       }
-
-                       XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, item->y,
-                                 menu->w, item->h, 0, item->y);
+                       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);

        }
 }
 
        }
 }
 


@@ -694,6 +733,8 @@ run(void)
        KeySym ksym;
        XEvent ev;
 
        KeySym ksym;
        XEvent ev;
 

+       setcurrmenu(rootmenu);
+

        while (!XNextEvent(dpy, &ev)) {
                switch(ev.type) {
                case Expose:
        while (!XNextEvent(dpy, &ev)) {
                switch(ev.type) {
                case Expose:


@@ -701,47 +742,46 @@ run(void)
                                drawmenu();
                        break;
                case MotionNotify:
                                drawmenu();
                        break;
                case MotionNotify:

-                       getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
-                       if (menu != NULL && item != NULL) {
-                               if (previtem != item) {
-                                       if (item->submenu != NULL)
-                                               setcurrmenu(item->submenu);
-                                       else
-                                               setcurrmenu(menu);
-                                       previtem = item;
-                                       drawmenu();
-                               } else if (menu->selected != item) {
-                                       menu->selected = item;
-                                       drawmenu();
-                               }
+                       menu = getmenu(ev.xbutton.window);
+                       item = getitem(menu, ev.xbutton.y);
+                       if (menu == NULL || item == NULL)
+                               break;
+                       if (previtem != item) {
+                               menu->selected = item;
+                               if (item->submenu != NULL)
+                                       setcurrmenu(item->submenu);
+                               else
+                                       setcurrmenu(menu);
+                               previtem = item;
+                               drawmenu();

                        }
                        break;
                case ButtonRelease:
                        }
                        break;
                case ButtonRelease:

-                       getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
-                       if (menu != NULL && item != NULL) {
-selectitem:
-                               if (item->label == NULL)
-                                       break;  /* ignore separators */
-                               if (item->submenu != NULL) {
-                                       setcurrmenu(item->submenu);
-                               } else {
-                                       printf("%s\n", item->output);
-                                       return;
-                               }
-                               currmenu->selected = currmenu->list;
-                               drawmenu();
+                       menu = getmenu(ev.xbutton.window);
+                       item = getitem(menu, ev.xbutton.y);
+                       if (menu == NULL || item == NULL)

                                break;
                                break;

+selectitem:
+                       if (item->label == NULL)
+                               break;  /* ignore separators */
+                       if (item->submenu != NULL) {
+                               setcurrmenu(item->submenu);

                        } else {
                        } else {

+                               printf("%s\n", item->output);

                                return;
                        }
                                return;
                        }

+                       currmenu->selected = currmenu->list;
+                       drawmenu();
+                       break;

                case ButtonPress:
                case ButtonPress:

-                       getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item);
-                       if (menu == NULL || item == NULL)
+                       menu = getmenu(ev.xbutton.window);
+                       if (menu == NULL)

                                return;
                        break;
                case KeyPress:
                        ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0);
 
                                return;
                        break;
                case KeyPress:
                        ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0);
 

+                       /* esc closes xmenu when current menu is the root menu */

                        if (ksym == XK_Escape && currmenu == rootmenu)
                                return;
 
                        if (ksym == XK_Escape && currmenu == rootmenu)
                                return;
 


@@ -769,6 +809,7 @@ selectitem:
                        drawmenu();
                        break;
                case LeaveNotify:
                        drawmenu();
                        break;
                case LeaveNotify:

+                       previtem = NULL;

                        currmenu->selected = NULL;
                        drawmenu();
                        break;
                        currmenu->selected = NULL;
                        drawmenu();
                        break;


@@ -776,7 +817,7 @@ selectitem:
        }
 }
 
        }
 }
 

-/* recursivelly free a pixmap */
+/* recursivelly free pixmaps and destroy windows */

 static void
 freewindow(struct Menu *menu)
 {
 static void
 freewindow(struct Menu *menu)
 {


@@ -801,8 +842,8 @@ cleanup(void)
        XftColorFree(dpy, visual, colormap, &dc.normal[ColorFG]);
        XftColorFree(dpy, visual, colormap, &dc.selected[ColorBG]);
        XftColorFree(dpy, visual, colormap, &dc.selected[ColorFG]);
        XftColorFree(dpy, visual, colormap, &dc.normal[ColorFG]);
        XftColorFree(dpy, visual, colormap, &dc.selected[ColorBG]);
        XftColorFree(dpy, visual, colormap, &dc.selected[ColorFG]);

-       XftColorFree(dpy, visual, colormap, &dc.decoration[ColorBG]);
-       XftColorFree(dpy, visual, colormap, &dc.decoration[ColorFG]);
+       XftColorFree(dpy, visual, colormap, &dc.separator);
+       XftColorFree(dpy, visual, colormap, &dc.border);

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


@@ -812,6 +853,6 @@ cleanup(void)
 static void
 usage(void)
 {
 static void
 usage(void)
 {

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

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