Improved README

[xmenu] / xmenu.c

diff --git a/xmenu.c b/xmenu.c
index d02620a..273f690 100644 (file)
--- a/xmenu.c
+++ b/xmenu.c
@@ -5,27 +5,36 @@
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

+#include <X11/Xresource.h>
+#include <X11/XKBlib.h>
+#include <X11/Xft/Xft.h>
+
+#define PROGNAME "xmenu"
+#define ITEMPREV 0
+#define ITEMNEXT 1

 
 /* macros */
 #define LEN(x) (sizeof (x) / sizeof (x[0]))
 
 /* macros */
 #define LEN(x) (sizeof (x) / sizeof (x[0]))

+#define MAX(x,y) ((x)>(y)?(x):(y))
+#define MIN(x,y) ((x)<(y)?(x):(y))

 
 /* color enum */
 enum {ColorFG, ColorBG, ColorLast};
 
 /* draw context structure */
 struct DC {
 
 /* color enum */
 enum {ColorFG, ColorBG, ColorLast};
 
 /* draw context structure */
 struct DC {

-       unsigned long unpressed[ColorLast];
-       unsigned long pressed[ColorLast];
-       unsigned long decoration[ColorLast];
+       XftColor normal[ColorLast];
+       XftColor selected[ColorLast];
+       XftColor border;
+       XftColor separator;

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

-       XFontStruct *font;
-       int fonth;
+       XftFont *font;

 };
 
 /* 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 */


@@ -41,59 +50,65 @@ struct ScreenGeometry {
 
 /* menu item structure */
 struct Item {
 
 /* menu item structure */
 struct Item {

-       char *label;
-       char *output;
-       int y;
-       int h;
-       struct Item *next;
-       struct Menu *submenu;
+       char *label;            /* string to be drawed on menu */
+       char *output;           /* string to be outputed when item is clicked */
+       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 */

 };
 
 /* menu structure */
 struct Menu {
 };
 
 /* menu structure */
 struct Menu {

-       struct Menu *parent;
-       struct Item *list;
-       struct Item *selected;
-       int x, y, w, h;
-       unsigned level;
-       Window win;
+       struct Menu *parent;    /* parent menu */
+       struct Item *caller;    /* item that spawned the menu */
+       struct Item *list;      /* list of items contained by the menu */
+       struct Item *selected;  /* item currently selected in the menu */
+       int x, y, w, h;         /* menu geometry */
+       unsigned level;         /* menu level relative to root */
+       Drawable pixmap;        /* pixmap to draw the menu on */
+       XftDraw *draw;
+       Window win;             /* menu window to map on the screen */

 };
 
 /* function declarations */
 };
 
 /* function declarations */

-static unsigned long getcolor(const char *s);
+static void getcolor(const char *s, XftColor *color);
+static void getresources(void);

 static void setupdc(void);
 static void setupgeom(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);

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

 static void usage(void);
 
 /* X variables */
 static Colormap colormap;
 static Display *dpy;
 static void usage(void);
 
 /* X variables */
 static Colormap colormap;
 static Display *dpy;

+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"
 


@@ -102,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;


@@ -119,13 +131,14 @@ main(int argc, char *argv[])
        if ((dpy = XOpenDisplay(NULL)) == NULL)
                errx(1, "cannot open display");
        screen = DefaultScreen(dpy);
        if ((dpy = XOpenDisplay(NULL)) == NULL)
                errx(1, "cannot open display");
        screen = DefaultScreen(dpy);

+       visual = DefaultVisual(dpy, screen);

        rootwin = RootWindow(dpy, screen);
        colormap = DefaultColormap(dpy, screen);
 
        /* setup */
        rootwin = RootWindow(dpy, screen);
        colormap = DefaultColormap(dpy, screen);
 
        /* setup */

+       getresources();

        setupdc();
        setupgeom();
        setupdc();
        setupgeom();

-       setupgrab();

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


@@ -134,21 +147,69 @@ main(int argc, char *argv[])
        calcscreengeom();
        calcmenu(rootmenu);
 
        calcscreengeom();
        calcmenu(rootmenu);
 

+       /* grab mouse and keyboard */
+       grabpointer();
+       grabkeyboard();
+

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

-       return 1;   /* UNREACHABLE */
+       cleanup();
+       return 0;

 }
 
 }
 

-/* get color from color string */
-static unsigned long
-getcolor(const char *s)
+/* read xrdb for configuration options */
+static void
+getresources(void)

 {
 {

-       XColor color;
+       char *xrm;
+       long n;
+       char *type;
+       XrmDatabase xdb;
+       XrmValue xval;
+
+       XrmInitialize();
+       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);
+}

 
 

-       if(!XAllocNamedColor(dpy, colormap, s, &color, &color))
+/* get color from color string */
+static void
+getcolor(const char *s, XftColor *color)
+{
+       if(!XftColorAllocName(dpy, visual, colormap, s, color))

                errx(1, "cannot allocate color: %s", s);
                errx(1, "cannot allocate color: %s", s);

-       return color.pixel;

 }
 
 /* init draw context */
 }
 
 /* init draw context */


@@ -156,40 +217,30 @@ static void
 setupdc(void)
 {
        /* get color pixels */
 setupdc(void)
 {
        /* get color pixels */

-       dc.unpressed[ColorBG] = getcolor(UNPRESSEDBG);
-       dc.unpressed[ColorFG] = getcolor(UNPRESSEDFG);
-       dc.pressed[ColorBG] = getcolor(PRESSEDBG);
-       dc.pressed[ColorFG] = getcolor(PRESSEDFG);
-       dc.decoration[ColorBG] = getcolor(DECORATIONBG);
-       dc.decoration[ColorFG] = getcolor(DECORATIONFG);
+       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 */
 
        /* try to get font */

-       if ((dc.font = XLoadQueryFont(dpy, FONT)) == NULL)
+       if ((dc.font = XftFontOpenName(dpy, screen, font)) == NULL)

                errx(1, "cannot load font");
                errx(1, "cannot load font");

-       dc.fonth = dc.font->ascent + dc.font->descent;

 
 

-       /* create GC and set its font */
+       /* create common GC */

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

-       XSetFont(dpy, dc.gc, dc.font->fid);

 }
 
 /* init menu geometry values */
 static void
 setupgeom(void)
 {
 }
 
 /* init menu geometry values */
 static void
 setupgeom(void)
 {

-       geom.itemb = ITEMB;
-       geom.itemh = dc.fonth + ITEMB * 2;
-       geom.itemw = ITEMW;
-       geom.border = BORDER;
-       geom.separator = SEPARATOR;
-}
-
-/* grab pointer */
-static void
-setupgrab(void)
-{
-       XGrabPointer(dpy, rootwin, True, ButtonPressMask | ButtonReleaseMask,
-                    GrabModeAsync, GrabModeAsync, None, None, CurrentTime);
+       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 */


@@ -211,6 +262,10 @@ allocitem(const char *label, const char *output)
        }
        item->y = 0;
        item->h = item->label ? geom.itemh : geom.separator;
        }
        item->y = 0;
        item->h = item->label ? geom.itemh : geom.separator;

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

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


@@ -228,6 +283,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level)
                err(1, "malloc");
        menu->parent = parent;
        menu->list = list;
                err(1, "malloc");
        menu->parent = parent;
        menu->list = list;

+       menu->caller = NULL;

        menu->selected = NULL;
        menu->w = geom.itemw;
        menu->h = 0;    /* calculated by calcmenu() */
        menu->selected = NULL;
        menu->w = geom.itemw;
        menu->h = 0;    /* calculated by calcmenu() */


@@ -235,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];
-       swa.border_pixel = dc.decoration[ColorFG];
+       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
        swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask

-                      | PointerMotionMask;
+                      | PointerMotionMask | LeaveWindowMask;

        menu->win = XCreateWindow(dpy, rootwin, 0, 0, geom.itemw, geom.itemh, geom.border,
                                  CopyFromParent, CopyFromParent, CopyFromParent,
        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;


@@ -295,6 +353,8 @@ parsestdin(void)
                         rootmenu = menu;
                         prevmenu = menu;
                         count = 1;
                         rootmenu = menu;
                         prevmenu = menu;
                         count = 1;

+                        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;
                } else if (level < prevmenu->level) {   /* item is continuation of a parent menu*/
                        for (menu = prevmenu, i = level;
                              menu != NULL && i < prevmenu->level;


@@ -308,11 +368,19 @@ parsestdin(void)
                                ;
 
                        item->next = curritem;
                                ;
 
                        item->next = curritem;

+
+                       curritem->prev = item;
+                       curritem->next = NULL;
+

                        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;
                        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;

+
+                       curritem->prev = item;
+                       curritem->next = NULL;
+

                } else if (level > prevmenu->level) {   /* item begins a new menu */
                        menu = allocmenu(prevmenu, curritem, level);
 
                } else if (level > prevmenu->level) {   /* item begins a new menu */
                        menu = allocmenu(prevmenu, curritem, level);
 


@@ -320,6 +388,10 @@ parsestdin(void)
                                ;
 
                        item->submenu = menu;
                                ;
 
                        item->submenu = menu;

+                       menu->caller = item;
+
+                       curritem->prev = NULL;
+                       curritem->next = NULL;

 
                        prevmenu = menu;
                }
 
                        prevmenu = menu;
                }


@@ -340,21 +412,30 @@ 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;
        XWindowChanges changes;
        XSizeHints sizeh;

+       XGlyphInfo ext;

        struct Item *item;
        struct Item *item;

+       int labelwidth;

 
 

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

        for (item = menu->list; item != NULL; item = item->next) {
                item->y = menu->h;
                if (item->label == NULL)   /* height for separator item */
                        menu->h += geom.separator;
                else
                        menu->h += geom.itemh;
        for (item = menu->list; item != NULL; item = item->next) {
                item->y = menu->h;
                if (item->label == NULL)   /* height for separator item */
                        menu->h += geom.separator;
                else
                        menu->h += geom.itemh;

+
+               XftTextExtentsUtf8(dpy, dc.font, (XftChar8 *)item->label,
+                                  item->labellen, &ext);
+               labelwidth = ext.xOff + dc.font->height * 2;
+               menu->w = MAX(menu->w, labelwidth);

        }
 
        /* calculate menu's x and y positions */
        }
 
        /* calculate menu's x and y positions */


@@ -369,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 */

+               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;

 
 

-               /* 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) >= menu->w)
-                       menu->x = menu->parent->x + menu->parent->w;
-               else if (menu->parent->x > menu->w)
-                       menu->x = menu->parent->x - menu->w;
-
-               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)


@@ -389,15 +465,22 @@ calcmenu(struct Menu *menu)
 
        /* update menu geometry */
        changes.height = menu->h;
 
        /* update menu geometry */
        changes.height = menu->h;

+       changes.width = menu->w;

        changes.x = menu->x;
        changes.y = menu->y;
        changes.x = menu->x;
        changes.y = menu->y;

-       XConfigureWindow(dpy, menu->win, CWHeight | CWX | CWY, &changes);
+       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,
+                                    DefaultDepth(dpy, screen));
+       menu->draw = XftDrawCreate(dpy, menu->pixmap, visual, colormap);

 
        /* calculate positions of submenus */
        for (item = menu->list; item != NULL; item = item->next) {
 
        /* calculate positions of submenus */
        for (item = menu->list; item != NULL; item = item->next) {


@@ -406,47 +489,164 @@ 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 */
 static void
 setcurrmenu(struct Menu *currmenu_new)
 {
 }
 
 /* set currentmenu to menu, umap previous menus and map current menu and its parents */
 static void
 setcurrmenu(struct Menu *currmenu_new)
 {

-       struct Menu *menu;
+       struct Menu *menu, *menu_;
+       struct Item *item;
+       struct Menu *lcamenu;   /* lowest common ancestor 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;
 

-       for (menu = currmenu; menu != NULL; menu = menu->parent) {
+       /* 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;
+       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) {
+               menu->selected = NULL;

                XUnmapWindow(dpy, menu->win);
        }
 
        currmenu = currmenu_new;
 
                XUnmapWindow(dpy, menu->win);
        }
 
        currmenu = currmenu_new;
 

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

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

+       }
+}
+
+/* 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);
+       }

 }
 
 /* draw items of the current menu and of its ancestors */
 }
 
 /* draw items of the current menu and of its ancestors */


@@ -458,51 +658,69 @@ drawmenu(void)
 
        for (menu = currmenu; menu != NULL; menu = menu->parent) {
                for (item = menu->list; item != NULL; item = item->next) {
 
        for (menu = currmenu; menu != NULL; menu = menu->parent) {
                for (item = menu->list; item != NULL; item = item->next) {

-                       unsigned long *color;
-                       size_t labellen;
-                       int labelx, labely;
+                       XftColor *color;

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

-                       if (item->label == NULL)
-                               color = dc.decoration;
-                       else if (item == menu->selected)
-                               color = dc.pressed;
+                       if (item == menu->selected && item->label != NULL)
+                               color = dc.selected;

                        else
                        else

-                               color = dc.unpressed;
+                               color = dc.normal;

 
                        /* draw item box */
 
                        /* draw item box */

-                       XSetForeground(dpy, dc.gc, color[ColorBG]);
-                       XFillRectangle(dpy, menu->win, dc.gc, 0, item->y,
-                                      geom.itemw, item->h);
+                       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);
+               }

 
 

-                       /* continue if item is a separator */
-                       if (item->label == NULL)
-                               continue;
+               XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, 0,
+                             menu->w, menu->h, 0, 0);
+       }
+}

 
 

-                       /* draw item label */
-                       labellen = strlen(item->label);
-                       labelx = 0 + dc.fonth;
-                       labely = item->y + dc.fonth + geom.itemb;
-                       XSetForeground(dpy, dc.gc, color[ColorFG]);
-                       XDrawString(dpy, menu->win, dc.gc, labelx, labely, item->label, labellen);
+/* cycle through the items; non-zero direction is next, zero is prev */
+static struct Item *
+itemcycle(int direction)
+{
+       struct Item *item;
+       struct Item *lastitem;

 
 

-                       /* draw triangle, if item contains a submenu */
-                       if (item->submenu != NULL) {
-                               int trianglex = geom.itemw - (geom.itemb + dc.fonth);
-                               int triangley = item->y + geom.itemb;
-
-                               XPoint triangle[] = {
-                                       {trianglex, triangley},
-                                       {trianglex + dc.fonth, triangley + dc.fonth/2},
-                                       {trianglex, triangley + dc.fonth},
-                                       {trianglex, triangley}
-                               };
-
-                               XFillPolygon(dpy, menu->win, dc.gc, triangle, LEN(triangle),
-                                            Convex, CoordModeOrigin);
-                       }
-               }
+       item = NULL;
+
+       if (direction == ITEMNEXT) {
+               if (currmenu->selected == NULL)
+                       item = currmenu->list;
+               else if (currmenu->selected->next != NULL)
+                       item = currmenu->selected->next;
+
+               while (item != NULL && item->label == NULL)
+                       item = item->next;
+
+               if (item == NULL)
+                       item = currmenu->list;
+       } else {
+               for (lastitem = currmenu->list;
+                    lastitem != NULL && lastitem->next != NULL;
+                    lastitem = lastitem->next)
+                       ;
+
+               if (currmenu->selected == NULL)
+                       item = lastitem;
+               else if (currmenu->selected->prev != NULL)
+                       item = currmenu->selected->prev;
+
+               while (item != NULL && item->label == NULL)
+                       item = item->prev;
+
+               if (item == NULL)
+                       item = lastitem;

        }
        }

+
+       return item;

 }
 
 /* run event loop */
 }
 
 /* run event loop */


@@ -512,6 +730,7 @@ run(void)
        struct Menu *menu;
        struct Item *item;
        struct Item *previtem = NULL;
        struct Menu *menu;
        struct Item *item;
        struct Item *previtem = NULL;

+       KeySym ksym;

        XEvent ev;
 
        setcurrmenu(rootmenu);
        XEvent ev;
 
        setcurrmenu(rootmenu);


@@ -519,54 +738,121 @@ run(void)
        while (!XNextEvent(dpy, &ev)) {
                switch(ev.type) {
                case Expose:
        while (!XNextEvent(dpy, &ev)) {
                switch(ev.type) {
                case Expose:

-                       drawmenu();
+                       if (ev.xexpose.count == 0)
+                               drawmenu();

                        break;
                case MotionNotify:
                        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;
-                               } else if (menu->selected != item)
-                                       menu->selected = item;
+                       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();

                        }
                        }

-                       drawmenu();

                        break;
                case ButtonRelease:
                        break;
                case ButtonRelease:

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

                        } else {
                        } else {

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

                        }
                        }

+                       currmenu->selected = currmenu->list;
+                       drawmenu();
+                       break;
+               case ButtonPress:
+                       menu = getmenu(ev.xbutton.window);
+                       if (menu == NULL)
+                               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;
+
+                       /* Shift-Tab = ISO_Left_Tab */
+                       if (ksym == XK_Tab && (ev.xkey.state & ShiftMask))
+                               ksym = XK_ISO_Left_Tab;
+
+                       /* cycle through menu */
+                       item = NULL;
+                       if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) {
+                               item = itemcycle(ITEMPREV);
+                       } else if (ksym == XK_Tab || ksym == XK_Down) {
+                               item = itemcycle(ITEMNEXT);
+                       } else if ((ksym == XK_Return || ksym == XK_Right) &&
+                                  currmenu->selected != NULL) {
+                               item = currmenu->selected;
+                               goto selectitem;
+                       } else if ((ksym == XK_Escape || ksym == XK_Left) &&
+                                  currmenu->parent != NULL) {
+                               item = currmenu->parent->selected;
+                               setcurrmenu(currmenu->parent);
+                       } else
+                               break;
+                       currmenu->selected = item;
+                       drawmenu();
+                       break;
+               case LeaveNotify:
+                       previtem = NULL;
+                       currmenu->selected = NULL;
+                       drawmenu();

                        break;
                }
        }
 }
 
                        break;
                }
        }
 }
 

+/* recursivelly free pixmaps and destroy windows */
+static void
+freewindow(struct Menu *menu)
+{
+       struct Item *item;
+
+       for (item = menu->list; item != NULL; item = item->next)
+               if (item->submenu != NULL)
+                       freewindow(item->submenu);
+
+       XFreePixmap(dpy, menu->pixmap);
+       XftDrawDestroy(menu->draw);
+       XDestroyWindow(dpy, menu->win);
+}
+

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

-cleanupexit(void)
+cleanup(void)

 {
 {

+       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.selected[ColorFG]);
+       XftColorFree(dpy, visual, colormap, &dc.separator);
+       XftColorFree(dpy, visual, colormap, &dc.border);
+
+       XFreeGC(dpy, dc.gc);

        XCloseDisplay(dpy);
        XCloseDisplay(dpy);

-       exit(0);

 }
 
 /* show usage */
 static void
 usage(void)
 {
 }
 
 /* show usage */
 static void
 usage(void)
 {

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

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