X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/a77326901f6923610c36bab6abda3ffca4ed8d3e..4e219dd8f317d56fcc681a545a0465aac3c43050:/xmenu.c diff --git a/xmenu.c b/xmenu.c index aa6bab8..8d40ee1 100644 --- a/xmenu.c +++ b/xmenu.c @@ -5,23 +5,30 @@ #include #include #include +#include +#include +#include + +#define ITEMPREV 0 +#define ITEMNEXT 1 /* 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 { - unsigned long unpressed[ColorLast]; - unsigned long pressed[ColorLast]; - unsigned long decoration[ColorLast]; + XftColor normal[ColorLast]; + XftColor selected[ColorLast]; + XftColor decoration[ColorLast]; Drawable d; GC gc; - XFontStruct *font; - int fonth; + XftFont *font; }; /* menu geometry structure */ @@ -29,7 +36,8 @@ struct Geometry { int itemb; /* item border */ int itemw; /* item width */ int itemh; /* item height */ - int border; /* window border */ + int border; /* window border width */ + int separator; /* menu separator width */ }; /* screen geometry structure */ @@ -40,45 +48,52 @@ struct ScreenGeometry { /* menu item structure */ struct Item { - char *label; - char *output; - int x, y; - 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 { - struct Menu *parent; - struct Item *list; - struct Item *selected; - int x, y, w, h; - unsigned level; - unsigned nitems; - 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 */ -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 setupgrab(void); -static struct Item *allocitem(size_t count, const char *label, const char *output); +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 x, int y, - struct Menu **menu_ret, struct Item **item_ret); +static void getmenuitem(Window win, int y, struct Menu **menu_ret, struct Item **item_ret); static void drawmenu(void); static void calcscreengeom(void); static void calcmenu(struct Menu *menu); 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 Visual *visual; static Window rootwin; static int screen; static struct DC dc; @@ -89,7 +104,7 @@ static struct Menu *currmenu = NULL; /* geometry variables */ static struct Geometry geom; -static struct ScreenGeometry sgeom; +static struct ScreenGeometry screengeom; /* flag variables */ static Bool override_redirect = True; @@ -118,13 +133,14 @@ main(int argc, char *argv[]) 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 */ + getresources(); setupdc(); setupgeom(); - setupgrab(); /* generate menus and recalculate them */ parsestdin(); @@ -133,21 +149,74 @@ main(int argc, char *argv[]) calcscreengeom(); calcmenu(rootmenu); + /* grab mouse and keyboard */ + if (override_redirect) + setupgrab(); + + /* map root menu */ + currmenu = rootmenu; + XMapWindow(dpy, rootmenu->win); + /* 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; + + 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(!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); - return color.pixel; } /* init draw context */ @@ -155,55 +224,68 @@ static void 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, &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]); /* try to get font */ - if ((dc.font = XLoadQueryFont(dpy, FONT)) == NULL) + if ((dc.font = XftFontOpenName(dpy, screen, font)) == NULL) errx(1, "cannot load font"); - dc.fonth = dc.font->ascent + dc.font->descent; - /* create GC and set its font */ + /* create GC */ dc.gc = XCreateGC(dpy, rootwin, 0, NULL); - XSetFont(dpy, dc.gc, dc.font->fid); } /* init menu geometry values */ static void setupgeom(void) { - geom.itemb = ITEMB; - geom.itemh = dc.fonth + ITEMB * 2; - geom.itemw = ITEMW; - geom.border = BORDER; + 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) { - XGrabPointer(dpy, rootwin, True, ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, None, None, CurrentTime); + 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"); } /* allocate an item */ static struct Item * -allocitem(size_t count, const char *label, const char *output) +allocitem(const char *label, const char *output) { struct Item *item; if ((item = malloc(sizeof *item)) == NULL) err(1, "malloc"); - if ((item->label = strdup(label)) == NULL) - err(1, "strdup"); - if ((item->output = strdup(output)) == NULL) - err(1, "strdup"); - item->x = 0; - item->y = count * geom.itemh; + if (*label == '\0') { + item->label = NULL; + item->output = NULL; + } else { + if ((item->label = strdup(label)) == NULL) + err(1, "strdup"); + if ((item->output = strdup(output)) == NULL) + err(1, "strdup"); + } + 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; @@ -221,19 +303,19 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) err(1, "malloc"); menu->parent = parent; menu->list = list; + menu->caller = NULL; menu->selected = NULL; - menu->x = 0; - menu->y = 0; menu->w = geom.itemw; - menu->h = geom.itemh; + menu->h = 0; /* calculated by calcmenu() */ + menu->x = 0; /* calculated by calcmenu() */ + menu->y = 0; /* calculated by calcmenu() */ menu->level = level; - menu->nitems = 0; swa.override_redirect = override_redirect; - swa.background_pixel = dc.decoration[ColorBG]; - swa.border_pixel = dc.decoration[ColorFG]; + swa.background_pixel = dc.decoration[ColorBG].pixel; + swa.border_pixel = dc.decoration[ColorFG].pixel; 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, CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWEventMask, @@ -250,9 +332,10 @@ parsestdin(void) char *label, *output; unsigned level = 0; unsigned i; - struct Item *item, *p; - struct Menu *menu; - struct Menu *prevmenu = NULL; + 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 for loops */ + struct Menu *menu; /* dummy menu for for loops */ size_t count = 0; /* number of items in the current menu */ while (fgets(buf, BUFSIZ, stdin) != NULL) { @@ -281,13 +364,15 @@ parsestdin(void) if (*s == '\n') *s = '\0'; - item = allocitem(count, label, output); + curritem = allocitem(label, output); if (prevmenu == NULL) { /* there is no menu yet */ - menu = allocmenu(NULL, item, level); + menu = allocmenu(NULL, curritem, level); 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; @@ -297,25 +382,38 @@ parsestdin(void) if (menu == NULL) errx(1, "reached NULL menu"); - for (p = menu->list; p->next != NULL; p = p->next) + for (item = menu->list; item->next != NULL; item = item->next) ; - p->next = item; + item->next = curritem; + + curritem->prev = item; + curritem->next = NULL; + prevmenu = menu; } else if (level == prevmenu->level) { /* item is a continuation of current menu */ - for (p = prevmenu->list; p->next != NULL; p = p->next) + for (item = prevmenu->list; item->next != NULL; item = item->next) ; - p->next = item; + item->next = curritem; + + curritem->prev = item; + curritem->next = NULL; + } else if (level > prevmenu->level) { /* item begins a new menu */ - menu = allocmenu(prevmenu, item, level); + menu = allocmenu(prevmenu, curritem, level); - for (p = prevmenu->list; p->next != NULL; p = p->next) + for (item = prevmenu->list; item->next != NULL; item = item->next) ; - p->submenu = menu; + item->submenu = menu; + menu->caller = item; + + curritem->prev = NULL; + curritem->next = NULL; prevmenu = menu; } + count++; } } @@ -327,9 +425,9 @@ calcscreengeom(void) int a, b; /* unused variables */ unsigned mask; /* unused variable */ - XQueryPointer(dpy, rootwin, &w1, &w2, &sgeom.cursx, &sgeom.cursy, &a, &b, &mask); - sgeom.screenw = DisplayWidth(dpy, screen); - sgeom.screenh = DisplayHeight(dpy, screen); + XQueryPointer(dpy, rootwin, &w1, &w2, &screengeom.cursx, &screengeom.cursy, &a, &b, &mask); + screengeom.screenw = DisplayWidth(dpy, screen); + screengeom.screenh = DisplayHeight(dpy, screen); } /* recursivelly calculate height and position of the menus */ @@ -337,58 +435,75 @@ static void calcmenu(struct Menu *menu) { XWindowChanges changes; - struct Item *item, *p; - size_t i; + XSizeHints sizeh; + XGlyphInfo ext; + struct Item *item; + int labelwidth; - /* calculate number of items */ - i = 0; - for (item = menu->list; item != NULL; item = item->next) - i++; - menu->nitems = i; - menu->h = geom.itemh * i; + /* 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; + + 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 */ if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */ - if (sgeom.screenw - sgeom.cursx >= menu->w) - menu->x = sgeom.cursx; - else if (sgeom.cursx > menu->w) - menu->x = sgeom.cursx - menu->w; - - if (sgeom.screenh - sgeom.cursy >= menu->h) - menu->y = sgeom.cursy; - else if (sgeom.screenh > menu->h) - menu->y = sgeom.screenh - menu->h; + if (screengeom.screenw - screengeom.cursx >= menu->w) + menu->x = screengeom.cursx; + else if (screengeom.cursx > menu->w) + menu->x = screengeom.cursx - menu->w; + + if (screengeom.screenh - screengeom.cursy >= menu->h) + menu->y = screengeom.cursy; + 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 (p = menu->parent->list; p->submenu != menu; p = p->next) + for (item = menu->parent->list; item->submenu != menu; item = item->next) ; - if (sgeom.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.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 (sgeom.screenh - p->y > menu->h) - menu->y = p->y; - else if (sgeom.screenh - menu->parent->y > menu->h) + if (screengeom.screenh - (item->y + menu->parent->y) > menu->h) + menu->y = item->y + menu->parent->y; + else if (screengeom.screenh - menu->parent->y > menu->h) menu->y = menu->parent->y; - else if (sgeom.screenh > menu->h) - menu->y = sgeom.screenh - menu->h; - } - - /* calculate position of each item in the menu */ - for (i = 0, item = menu->list; item != NULL; item = item->next, i++) { - item->x = menu->x; - item->y = menu->y + i * geom.itemh; + else if (screengeom.screenh > menu->h) + menu->y = screengeom.screenh - menu->h; } /* update menu geometry */ changes.height = menu->h; + changes.width = menu->w; 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 */ + 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); + /* 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) { if (item->submenu != NULL) calcmenu(item->submenu); @@ -397,7 +512,7 @@ calcmenu(struct Menu *menu) /* get menu and item of given window and position */ static void -getmenuitem(Window win, int x, int y, +getmenuitem(Window win, int y, struct Menu **menu_ret, struct Item **item_ret) { struct Menu *menu = NULL; @@ -406,8 +521,7 @@ getmenuitem(Window win, int x, int y, for (menu = currmenu; menu != NULL; menu = menu->parent) { if (menu->win == win) { for (item = menu->list; item != NULL; item = item->next) { - if (x >= item->x && x <= item->x + geom.itemw && - y >= item->y && y <= item->y + geom.itemh) { + if (y >= item->y && y <= item->y + item->h) { goto done; } } @@ -424,19 +538,52 @@ done: 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 */ if (currmenu_new == currmenu) return; - for (menu = currmenu; menu != NULL; menu = menu->parent) { + /* 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; + } + + /* unmap menus from currmenu (inclusive) until lcamenu (exclusive) */ + for (menu = currmenu; menu != lcamenu; menu = menu->parent) { 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); + if (item != NULL) + menu->selected = item; + item = menu->caller; + } } /* draw items of the current menu and of its ancestors */ @@ -447,57 +594,98 @@ drawmenu(void) struct Item *item; for (menu = currmenu; menu != NULL; menu = menu->parent) { - size_t nitems; /* number of items before current item */ - - nitems = 0; for (item = menu->list; item != NULL; item = item->next) { - unsigned long *color; - size_t labellen; + XftColor *color; int labelx, labely; - int y; /* determine item color */ if (item == menu->selected) - color = dc.pressed; + color = dc.selected; else - color = dc.unpressed; + color = dc.normal; - /* calculate item's y position */ - y = nitems * geom.itemh; + /* continue if item is a separator */ + if (item->label == NULL) + continue; /* draw item box */ - XSetForeground(dpy, dc.gc, color[ColorBG]); - XFillRectangle(dpy, menu->win, dc.gc, 0, y, - geom.itemw, geom.itemh); + 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); /* draw item label */ - labellen = strlen(item->label); - labelx = 0 + dc.fonth; - labely = y + dc.fonth + geom.itemb; - XSetForeground(dpy, dc.gc, color[ColorFG]); - XDrawString(dpy, menu->win, dc.gc, labelx, labely, item->label, labellen); + 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 = geom.itemw - (geom.itemb + dc.fonth); - int triangley = y + geom.itemb; + int trianglex = menu->w - dc.font->height + geom.itemb - 1; + int triangley = item->y + (3 * item->h)/8 -1; XPoint triangle[] = { {trianglex, triangley}, - {trianglex + dc.fonth, triangley + dc.fonth/2}, - {trianglex, triangley + dc.fonth}, + {trianglex + item->h/8 + 1, item->y + item->h/2}, + {trianglex, triangley + item->h/4 + 2}, {trianglex, triangley} }; - XFillPolygon(dpy, menu->win, dc.gc, triangle, LEN(triangle), + XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle), Convex, CoordModeOrigin); } - nitems++; + XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, item->y, + menu->w, item->h, 0, item->y); } } } +/* cycle through the items; non-zero direction is next, zero is prev */ +static struct Item * +itemcycle(int direction) +{ + struct Item *item; + struct Item *lastitem; + + 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 */ static void run(void) @@ -505,18 +693,17 @@ run(void) struct Menu *menu; struct Item *item; struct Item *previtem = NULL; + KeySym ksym; XEvent ev; - setcurrmenu(rootmenu); - while (!XNextEvent(dpy, &ev)) { switch(ev.type) { case Expose: - drawmenu(); + if (ev.xexpose.count == 0) + drawmenu(); break; case MotionNotify: - getmenuitem(ev.xbutton.window, ev.xbutton.x_root, ev.xbutton.y_root, - &menu, &item); + getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item); if (menu != NULL && item != NULL) { if (previtem != item) { if (item->submenu != NULL) @@ -524,42 +711,109 @@ run(void) else setcurrmenu(menu); previtem = item; - } else if (menu->selected != item) + drawmenu(); + } else if (menu->selected != item) { menu->selected = item; + drawmenu(); + } } - drawmenu(); break; case ButtonRelease: - getmenuitem(ev.xbutton.window, ev.xbutton.x_root, ev.xbutton.y_root, - &menu, &item); + 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); - cleanupexit(); + return; } + currmenu->selected = currmenu->list; drawmenu(); + break; } else { - cleanupexit(); + return; } + case ButtonPress: + getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item); + if (menu == NULL || item == NULL) + return; + break; + case KeyPress: + ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0); + + 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: + currmenu->selected = NULL; + drawmenu(); break; } } } +/* recursivelly free a pixmap */ +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 -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.decoration[ColorBG]); + XftColorFree(dpy, visual, colormap, &dc.decoration[ColorFG]); + + XFreeGC(dpy, dc.gc); XCloseDisplay(dpy); - exit(0); } /* show usage */ static void usage(void) { - (void)fprintf(stderr, "usage: xmenu [-w] menuname\n"); + (void)fprintf(stderr, "usage: xmenu [-w]\n"); exit(1); }