X-Git-Url: http://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/2744390027e330553aff63b8f1ee32b672895ec5..6d56f2796cf9946362a56f0e868034bf384fc52d:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 03c184e..56d470b 100644 --- a/xmenu.c +++ b/xmenu.c @@ -1,124 +1,138 @@ +#include #include +#include #include #include #include +#include +#include #include #include +#include #include #include #include #include - -#define PROGNAME "xmenu" -#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 { - XftColor normal[ColorLast]; - XftColor selected[ColorLast]; - XftColor decoration[ColorLast]; - - Drawable d; - GC gc; - XftFont *font; -}; - -/* menu geometry structure */ -struct Geometry { - int itemb; /* item border */ - int itemw; /* item width */ - int itemh; /* item height */ - int border; /* window border width */ - int separator; /* menu separator width */ -}; - -/* screen geometry structure */ -struct ScreenGeometry { - int cursx, cursy; /* cursor position */ - int screenw, screenh; /* screen width and height */ -}; - -/* menu item structure */ -struct Item { - 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; /* 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 void getcolor(const char *s, XftColor *color); -static void getresources(void); -static void setupdc(void); -static void setupgeom(void); -static struct Item *allocitem(const char *label, const char *output); +#include +#include +#include "xmenu.h" + +/* + * Function declarations + */ + +/* argument parser */ +static void parseposition(char *optarg); + +/* initializers, and their helper routines */ +static void parsefonts(const char *s); +static void ealloccolor(const char *s, XftColor *color); +static void initmonitor(void); +static void initresources(void); +static void initdc(void); +static void initiconsize(void); +static void initatoms(void); + +/* structure builders, and their helper routines */ +static struct Item *allocitem(const char *label, const char *output, char *file); static struct Menu *allocmenu(struct Menu *parent, struct Item *list, unsigned level); -static 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 struct Menu *buildmenutree(unsigned level, const char *label, const char *output, char *file); +static struct Menu *parsestdin(void); + +/* text drawer, and its helper routine */ +static FcChar32 getnextutf8char(const char *s, const char **end_ret); +static XftFont *getfontucode(FcChar32 ucode); +static int drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text); + +/* structure setters, and their helper routines */ +static void setupitems(struct Menu *menu); +static void setupmenupos(struct Menu *menu); +static void setupmenu(struct Menu *menu, XClassHint *classh); + +/* grabbers */ 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 freewindow(struct Menu *menu); + +/* item drawer, and its helper routine */ +static Imlib_Image loadicon(const char *file); +static void drawitems(struct Menu *menu); + +/* menu drawers and mappers */ +static void drawmenus(struct Menu *currmenu); +static void mapmenu(struct Menu *currmenu); + +/* getters */ +static struct Menu *getmenu(struct Menu *currmenu, Window win); +static struct Item *getitem(struct Menu *menu, int y); + +/* cycle through items */ +static struct Item *itemcycle(struct Menu *currmenu, int direction); + +/* main event loop */ +static void run(struct Menu *currmenu); + +/* cleaners */ +static void cleanmenu(struct Menu *menu); static void cleanup(void); + +/* show usage */ static void usage(void); -/* X variables */ -static Colormap colormap; + +/* + * Variable declarations + */ + +/* X stuff */ static Display *dpy; +static int screen; static Visual *visual; static Window rootwin; -static int screen; +static Colormap colormap; static struct DC dc; +static struct Monitor mon; +static Atom utf8string; +static Atom wmdelete; +static Atom netatom[NetLast]; + +/* flags */ +static int fflag = 0; /* whether glyphs should align based on the first font */ +static int iflag = 0; /* whether to disable icons */ +static int mflag = 0; /* whether the user specified a monitor with -p */ +static int pflag = 0; /* whether the user specified a position with -p */ +static int wflag = 0; /* whether to let the window manager control XMenu */ + +/* include config variable */ +#include "config.h" -/* menu variables */ -static struct Menu *rootmenu = NULL; -static struct Menu *currmenu = NULL; -static char **menutitle; -static int menutitlecount; - -/* geometry variables */ -static struct Geometry geom; -static struct ScreenGeometry screengeom; -#include "config.h" +/* + * Function implementations + */ +/* xmenu: generate menu from stdin and print selected entry to stdout */ int main(int argc, char *argv[]) { + struct Menu *rootmenu; + XClassHint classh; int ch; - while ((ch = getopt(argc, argv, "")) != -1) { + while ((ch = getopt(argc, argv, "fip:w")) != -1) { switch (ch) { + case 'f': + fflag = 1; + break; + case 'i': + iflag = 1; + break; + case 'p': + pflag = 1; + parseposition(optarg); + break; + case 'w': + wflag = 1; + break; default: usage(); break; @@ -127,8 +141,8 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - menutitle = argv; - menutitlecount = argc; + if (argc > 1) + usage(); /* open connection to server and set X variables */ if ((dpy = XOpenDisplay(NULL)) == NULL) @@ -138,148 +152,309 @@ main(int argc, char *argv[]) rootwin = RootWindow(dpy, screen); colormap = DefaultColormap(dpy, screen); - /* setup */ - getresources(); - setupdc(); - setupgeom(); + /* imlib2 stuff */ + if (!iflag) { + imlib_set_cache_size(2048 * 1024); + imlib_context_set_dither(1); + imlib_context_set_display(dpy); + imlib_context_set_visual(visual); + imlib_context_set_colormap(colormap); + } - /* generate menus and recalculate them */ - parsestdin(); + /* initializers */ + initmonitor(); + initresources(); + initdc(); + initiconsize(); + initatoms(); + + /* set window class */ + classh.res_class = PROGNAME; + if (argc == 1) + classh.res_name = *argv; + else + classh.res_name = PROGNAME; + + /* generate menus and set them up */ + rootmenu = parsestdin(); if (rootmenu == NULL) errx(1, "no menu generated"); - calcscreengeom(); - calcmenu(rootmenu); + setupmenu(rootmenu, &classh); /* grab mouse and keyboard */ - grabpointer(); - grabkeyboard(); - - /* map root menu */ - setcurrmenu(rootmenu); - XMapWindow(dpy, rootmenu->win); + if (!wflag) { + grabpointer(); + grabkeyboard(); + } /* run event loop */ - run(); + run(rootmenu); + /* freeing stuff */ + cleanmenu(rootmenu); cleanup(); + return 0; } -/* read xrdb for configuration options */ +/* parse position string from -p, + * put results on config.posx, config.posy, and config.monitor */ static void -getresources(void) +parseposition(char *optarg) { - char *xrm; long n; + char *s = optarg; + char *endp; + + n = strtol(s, &endp, 10); + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != 'x') + goto error; + config.posx = n; + s = endp+1; + n = strtol(s, &endp, 10); + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s) + goto error; + config.posy = n; + if (*endp == ':') { + s = endp+1; + mflag = 1; + if (strncasecmp(s, "CUR", 3) == 0) { + config.monitor = -1; + endp = s+3; + } else { + n = strtol(s, &endp, 10); + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0') + goto error; + config.monitor = n; + } + } else if (*endp != '\0') { + goto error; + } - 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); + return; + +error: + errx(1, "improper position: %s", optarg); +} + +/* parse color string */ +static void +parsefonts(const char *s) +{ + const char *p; + char buf[1024]; + size_t nfont = 0; + + dc.nfonts = 1; + for (p = s; *p; p++) + if (*p == ',') + dc.nfonts++; + + if ((dc.fonts = calloc(dc.nfonts, sizeof *dc.fonts)) == NULL) + err(1, "calloc"); + + p = s; + while (*p != '\0') { + size_t i; + + i = 0; + while (isspace(*p)) + p++; + while (i < sizeof buf && *p != '\0' && *p != ',') { + buf[i++] = *p++; + } + if (i >= sizeof buf) + errx(1, "font name too long"); + if (*p == ',') + p++; + buf[i] = '\0'; + if (nfont == 0) + if ((dc.pattern = FcNameParse((FcChar8 *)buf)) == NULL) + errx(1, "the first font in the cache must be loaded from a font string"); + if ((dc.fonts[nfont++] = XftFontOpenName(dpy, screen, buf)) == NULL) + errx(1, "cannot load font"); } } /* get color from color string */ static void -getcolor(const char *s, XftColor *color) +ealloccolor(const char *s, XftColor *color) { if(!XftColorAllocName(dpy, visual, colormap, s, color)) errx(1, "cannot allocate color: %s", s); } +/* query monitor information and cursor position */ +static void +initmonitor(void) +{ + XineramaScreenInfo *info = NULL; + Window dw; /* dummy variable */ + int di; /* dummy variable */ + unsigned du; /* dummy variable */ + int cursx, cursy; /* cursor position */ + int nmons; + int i; + + XQueryPointer(dpy, rootwin, &dw, &dw, &cursx, &cursy, &di, &di, &du); + + mon.x = mon.y = 0; + mon.w = DisplayWidth(dpy, screen); + mon.h = DisplayHeight(dpy, screen); + + if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) { + int selmon = 0; + + if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) { + for (i = 0; i < nmons; i++) { + if (BETWEEN(cursx, info[i].x_org, info[i].x_org + info[i].width) && + BETWEEN(cursy, info[i].y_org, info[i].y_org + info[i].height)) { + selmon = i; + break; + } + } + } else { + selmon = config.monitor; + } + + mon.x = info[selmon].x_org; + mon.y = info[selmon].y_org; + mon.w = info[selmon].width; + mon.h = info[selmon].height; + } + + if (!pflag) { + config.posx = cursx; + config.posy = cursy; + } else if (mflag) { + config.posx += mon.x; + config.posy += mon.y; + } +} + +/* read xrdb for configuration options */ +static void +initresources(void) +{ + 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) + config.border_pixels = n; + if (XrmGetResource(xdb, "xmenu.separatorWidth", "*", &type, &xval) == True) + if ((n = strtol(xval.addr, NULL, 10)) > 0) + config.separator_pixels = n; + if (XrmGetResource(xdb, "xmenu.height", "*", &type, &xval) == True) + if ((n = strtol(xval.addr, NULL, 10)) > 0) + config.height_pixels = n; + if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True) + if ((n = strtol(xval.addr, NULL, 10)) > 0) + config.width_pixels = n; + if (XrmGetResource(xdb, "xmenu.gap", "*", &type, &xval) == True) + if ((n = strtol(xval.addr, NULL, 10)) > 0) + config.gap_pixels = n; + if (XrmGetResource(xdb, "xmenu.background", "*", &type, &xval) == True) + config.background_color = strdup(xval.addr); + if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True) + config.foreground_color = strdup(xval.addr); + if (XrmGetResource(xdb, "xmenu.selbackground", "*", &type, &xval) == True) + config.selbackground_color = strdup(xval.addr); + if (XrmGetResource(xdb, "xmenu.selforeground", "*", &type, &xval) == True) + config.selforeground_color = strdup(xval.addr); + if (XrmGetResource(xdb, "xmenu.separator", "*", &type, &xval) == True) + config.separator_color = strdup(xval.addr); + if (XrmGetResource(xdb, "xmenu.border", "*", &type, &xval) == True) + config.border_color = strdup(xval.addr); + if (XrmGetResource(xdb, "xmenu.font", "*", &type, &xval) == True) + config.font = strdup(xval.addr); + + XrmDestroyDatabase(xdb); +} + /* init draw context */ static void -setupdc(void) +initdc(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]); - - /* try to get font */ - if ((dc.font = XftFontOpenName(dpy, screen, font)) == NULL) - errx(1, "cannot load font"); - - /* create GC */ + ealloccolor(config.background_color, &dc.normal[ColorBG]); + ealloccolor(config.foreground_color, &dc.normal[ColorFG]); + ealloccolor(config.selbackground_color, &dc.selected[ColorBG]); + ealloccolor(config.selforeground_color, &dc.selected[ColorFG]); + ealloccolor(config.separator_color, &dc.separator); + ealloccolor(config.border_color, &dc.border); + + /* parse fonts */ + parsefonts(config.font); + + /* create common GC */ dc.gc = XCreateGC(dpy, rootwin, 0, NULL); } -/* init menu geometry values */ +/* calculate icon size */ +static void +initiconsize(void) +{ + config.iconsize = config.height_pixels - config.iconpadding * 2; +} + +/* intern atoms */ static void -setupgeom(void) +initatoms(void) { - geom.itemb = itemborder; - geom.itemh = dc.font->height + itemborder * 2; - geom.itemw = width; - geom.border = menuborder; - geom.separator = separatorsize; + utf8string = XInternAtom(dpy, "UTF8_STRING", False); + wmdelete = XInternAtom(dpy, "WM_DELETE_WINDOW", False); + netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False); + netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); + netatom[NetWMWindowTypePopupMenu] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_POPUP_MENU", False); } /* allocate an item */ static struct Item * -allocitem(const char *label, const char *output) +allocitem(const char *label, const char *output, char *file) { struct Item *item; if ((item = malloc(sizeof *item)) == NULL) err(1, "malloc"); - if (*label == '\0') { + if (label == NULL) { item->label = NULL; item->output = NULL; } else { if ((item->label = strdup(label)) == NULL) err(1, "strdup"); - if ((item->output = strdup(output)) == NULL) + if (label == output) { + item->output = item->label; + } else { + if ((item->output = strdup(output)) == NULL) + err(1, "strdup"); + } + } + if (file == NULL) { + item->file = NULL; + } else { + if ((item->file = strdup(file)) == NULL) err(1, "strdup"); } item->y = 0; - item->h = item->label ? geom.itemh : geom.separator; - if (item->label == NULL) - item->labellen = 0; - else - item->labellen = strlen(item->label); + item->h = 0; item->next = NULL; item->submenu = NULL; + item->icon = NULL; return item; } -/* allocate a menu */ +/* allocate a menu and create its window */ static struct Menu * allocmenu(struct Menu *parent, struct Item *list, unsigned level) { @@ -292,210 +467,389 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) menu->list = list; menu->caller = NULL; menu->selected = NULL; - menu->w = geom.itemw; - menu->h = 0; /* calculated by calcmenu() */ - menu->x = 0; /* calculated by calcmenu() */ - menu->y = 0; /* calculated by calcmenu() */ + menu->w = 0; /* recalculated by setupmenu() */ + menu->h = 0; /* recalculated by setupmenu() */ + menu->x = mon.x; /* recalculated by setupmenu() */ + menu->y = mon.y; /* recalculated by setupmenu() */ menu->level = level; + menu->drawn = 0; + menu->hasicon = 0; - swa.override_redirect = True; - swa.background_pixel = dc.decoration[ColorBG].pixel; - swa.border_pixel = dc.decoration[ColorFG].pixel; + swa.override_redirect = (wflag) ? False : True; + swa.background_pixel = dc.normal[ColorBG].pixel; + swa.border_pixel = dc.border.pixel; + swa.save_under = True; /* pop-up windows should save_under*/ swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | LeaveWindowMask; - menu->win = XCreateWindow(dpy, rootwin, 0, 0, geom.itemw, geom.itemh, geom.border, + if (wflag) + swa.event_mask |= StructureNotifyMask; + menu->win = XCreateWindow(dpy, rootwin, 0, 0, 1, 1, 0, CopyFromParent, CopyFromParent, CopyFromParent, - CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWEventMask, + CWOverrideRedirect | CWBackPixel | + CWBorderPixel | CWEventMask | CWSaveUnder, &swa); return menu; } -/* create menus and items from the stdin */ -static void -parsestdin(void) +/* build the menu tree */ +static struct Menu * +buildmenutree(unsigned level, const char *label, const char *output, char *file) { - char *s, buf[BUFSIZ]; - char *label, *output; - unsigned level = 0; + static struct Menu *prevmenu = NULL; /* menu the previous item was added to */ + static struct Menu *rootmenu = NULL; /* menu to be returned */ + struct Item *curritem = NULL; /* item currently being read */ + struct Item *item; /* dummy item for loops */ + struct Menu *menu; /* dummy menu for loops */ unsigned i; - 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) { - level = 0; - s = buf; - - while (*s == '\t') { - level++; - s++; - } - label = output = s; + /* create the item */ + curritem = allocitem(label, output, file); + + /* put the item in the menu tree */ + if (prevmenu == NULL) { /* there is no menu yet */ + menu = allocmenu(NULL, curritem, level); + rootmenu = menu; + prevmenu = menu; + curritem->prev = NULL; + } else if (level < prevmenu->level) { /* item is continuation of a parent menu */ + /* go up the menu tree until find the menu this item continues */ + for (menu = prevmenu, i = level; + menu != NULL && i != prevmenu->level; + menu = menu->parent, i++) + ; + if (menu == NULL) + errx(1, "reached NULL menu"); - while (*s != '\0' && *s != '\t' && *s != '\n') - s++; + /* find last item in the new menu */ + for (item = menu->list; item->next != NULL; item = item->next) + ; - while (*s == '\t') - *s++ = '\0'; + prevmenu = menu; + item->next = curritem; + curritem->prev = item; + } else if (level == prevmenu->level) { /* item is a continuation of current menu */ + /* find last item in the previous menu */ + for (item = prevmenu->list; item->next != NULL; item = item->next) + ; - if (*s != '\0' && *s != '\n') - output = s; + item->next = curritem; + curritem->prev = item; + } else if (level > prevmenu->level) { /* item begins a new menu */ + menu = allocmenu(prevmenu, curritem, level); - while (*s != '\0' && *s != '\n') - s++; + /* find last item in the previous menu */ + for (item = prevmenu->list; item->next != NULL; item = item->next) + ; - if (*s == '\n') - *s = '\0'; + prevmenu = menu; + menu->caller = item; + item->submenu = menu; + curritem->prev = NULL; + } - curritem = allocitem(label, output); + if (curritem->file) + prevmenu->hasicon = 1; - if (prevmenu == NULL) { /* there is no menu yet */ - 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; - menu = menu->parent, i++) - ; + return rootmenu; +} - if (menu == NULL) - errx(1, "reached NULL menu"); +/* create menus and items from the stdin */ +static struct Menu * +parsestdin(void) +{ + struct Menu *rootmenu; + char *s, buf[BUFSIZ]; + char *file, *label, *output; + unsigned level = 0; - for (item = menu->list; item->next != NULL; item = item->next) - ; + rootmenu = NULL; - item->next = curritem; + while (fgets(buf, BUFSIZ, stdin) != NULL) { + /* get the indentation level */ + level = strspn(buf, "\t"); + + /* get the label */ + s = level + buf; + label = strtok(s, "\t\n"); + + /* get the filename */ + file = NULL; + if (label != NULL && strncmp(label, "IMG:", 4) == 0) { + file = label + 4; + label = strtok(NULL, "\t\n"); + } - curritem->prev = item; - curritem->next = NULL; + /* get the output */ + output = strtok(NULL, "\n"); + if (output == NULL) { + output = label; + } else { + while (*output == '\t') + output++; + } - prevmenu = menu; - } else if (level == prevmenu->level) { /* item is a continuation of current menu */ - for (item = prevmenu->list; item->next != NULL; item = item->next) - ; - item->next = curritem; + rootmenu = buildmenutree(level, label, output, file); + } - curritem->prev = item; - curritem->next = NULL; + return rootmenu; +} - } else if (level > prevmenu->level) { /* item begins a new menu */ - menu = allocmenu(prevmenu, curritem, level); +/* get next utf8 char from s return its codepoint and set next_ret to pointer to end of character */ +static FcChar32 +getnextutf8char(const char *s, const char **next_ret) +{ + static const unsigned char utfbyte[] = {0x80, 0x00, 0xC0, 0xE0, 0xF0}; + static const unsigned char utfmask[] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8}; + static const FcChar32 utfmin[] = {0, 0x00, 0x80, 0x800, 0x10000}; + static const FcChar32 utfmax[] = {0, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF}; + /* 0xFFFD is the replacement character, used to represent unknown characters */ + static const FcChar32 unknown = 0xFFFD; + FcChar32 ucode; /* FcChar32 type holds 32 bits */ + size_t usize = 0; /* n' of bytes of the utf8 character */ + size_t i; + + *next_ret = s+1; + + /* get code of first byte of utf8 character */ + for (i = 0; i < sizeof utfmask; i++) { + if (((unsigned char)*s & utfmask[i]) == utfbyte[i]) { + usize = i; + ucode = (unsigned char)*s & ~utfmask[i]; + break; + } + } - for (item = prevmenu->list; item->next != NULL; item = item->next) - ; + /* if first byte is a continuation byte or is not allowed, return unknown */ + if (i == sizeof utfmask || usize == 0) + return unknown; + + /* check the other usize-1 bytes */ + s++; + for (i = 1; i < usize; i++) { + *next_ret = s+1; + /* if byte is nul or is not a continuation byte, return unknown */ + if (*s == '\0' || ((unsigned char)*s & utfmask[0]) != utfbyte[0]) + return unknown; + /* 6 is the number of relevant bits in the continuation byte */ + ucode = (ucode << 6) | ((unsigned char)*s & ~utfmask[0]); + s++; + } - item->submenu = menu; - menu->caller = item; + /* check if ucode is invalid or in utf-16 surrogate halves */ + if (!BETWEEN(ucode, utfmin[usize], utfmax[usize]) + || BETWEEN (ucode, 0xD800, 0xDFFF)) + return unknown; - curritem->prev = NULL; - curritem->next = NULL; + return ucode; +} - prevmenu = menu; +/* get which font contains a given code point */ +static XftFont * +getfontucode(FcChar32 ucode) +{ + FcCharSet *fccharset; + FcPattern *fcpattern; + FcPattern *match; + XftResult result; + XftFont *retfont; + size_t i; + + for (i = 0; i < dc.nfonts; i++) + if (XftCharExists(dpy, dc.fonts[i], ucode) == FcTrue) + return dc.fonts[i]; + + /* create a charset containing our code point */ + fccharset = FcCharSetCreate(); + FcCharSetAddChar(fccharset, ucode); + + /* create a pattern akin to the dc.pattern but containing our code point */ + fcpattern = FcPatternDuplicate(dc.pattern); + FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); + + /* find pattern matching fcpattern */ + FcConfigSubstitute(NULL, fcpattern, FcMatchPattern); + FcDefaultSubstitute(fcpattern); + match = XftFontMatch(dpy, screen, fcpattern, &result); + + /* if found a pattern, open its font */ + if (match) { + retfont = XftFontOpenPattern(dpy, match); + if (retfont && XftCharExists(dpy, retfont, ucode) == FcTrue) { + if ((dc.fonts = realloc(dc.fonts, dc.nfonts+1)) == NULL) + err(1, "realloc"); + dc.fonts[dc.nfonts++] = retfont; + return retfont; + } else { + XftFontClose(dpy, retfont); } - count++; } + + /* in case no fount was found, return the first one */ + return dc.fonts[0]; } -/* calculate screen geometry */ -static void -calcscreengeom(void) +/* draw text into XftDraw, return width of text glyphs */ +static int +drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text) { - Window w1, w2; /* unused variables */ - int a, b; /* unused variables */ - unsigned mask; /* unused variable */ + int textwidth = 0; + int texty; + + texty = y + (h - (dc.fonts[0]->ascent + dc.fonts[0]->descent))/2 + dc.fonts[0]->ascent; + + while (*text) { + XftFont *currfont; + XGlyphInfo ext; + FcChar32 ucode; + const char *next; + size_t len; + + ucode = getnextutf8char(text, &next); + currfont = getfontucode(ucode); + + len = next - text; + XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)text, len, &ext); + textwidth += ext.xOff; + + if (draw) { + if (!fflag) + texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent; + XftDrawStringUtf8(draw, color, currfont, x, texty, (XftChar8 *)text, len); + x += ext.xOff; + } + + text = next; + } - XQueryPointer(dpy, rootwin, &w1, &w2, &screengeom.cursx, &screengeom.cursy, &a, &b, &mask); - screengeom.screenw = DisplayWidth(dpy, screen); - screengeom.screenh = DisplayHeight(dpy, screen); + return textwidth; } -/* recursivelly calculate menu geometry and set window hints */ +/* setup the height, width and icon of the items of a menu */ static void -calcmenu(struct Menu *menu) +setupitems(struct Menu *menu) { - static XClassHint classh = {PROGNAME, PROGNAME}; - XWindowChanges changes; - XTextProperty textprop; - XSizeHints sizeh; - XGlyphInfo ext; struct Item *item; - int labelwidth; - /* calculate items positions and menu width and height */ - menu->w = geom.itemw; + menu->w = config.width_pixels; for (item = menu->list; item != NULL; item = item->next) { + int itemwidth; + int textwidth; + item->y = menu->h; + if (item->label == NULL) /* height for separator item */ - menu->h += geom.separator; + item->h = config.separator_pixels; else - menu->h += geom.itemh; + item->h = config.height_pixels; + menu->h += item->h; - XftTextExtentsUtf8(dpy, dc.font, (XftChar8 *)item->label, - item->labellen, &ext); - labelwidth = ext.xOff + dc.font->height * 2; - menu->w = MAX(menu->w, labelwidth); + if (item->label) + textwidth = drawtext(NULL, NULL, 0, 0, 0, item->label); + else + textwidth = 0; + + /* + * set menu width + * + * the item width depends on the size of its label (textwidth), + * and it is only used to calculate the width of the menu (which + * is equal to the width of the largest item). + * + * the horizontal padding appears 4 times through the width of a + * item: before and after its icon, and before and after its triangle. + * if the iflag is set (icons are disabled) then the horizontal + * padding appears 3 times: before the label and around the triangle. + */ + itemwidth = textwidth + config.triangle_width + config.horzpadding * 3; + itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding; + menu->w = MAX(menu->w, itemwidth); } +} - /* calculate menu's x and y positions */ +/* setup the position of a menu */ +static void +setupmenupos(struct Menu *menu) +{ + int width, height; + + width = menu->w + config.border_pixels * 2; + height = menu->h + config.border_pixels * 2; if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */ - if (screengeom.screenw - screengeom.cursx >= menu->w) - menu->x = screengeom.cursx; - else if (screengeom.cursx > menu->w) - menu->x = screengeom.cursx - menu->w; + if (pflag || (config.posx > mon.x && mon.x + mon.w - config.posx >= width)) + menu->x = config.posx; + else if (config.posx > width) + menu->x = config.posx - width; + + if (pflag || (config.posy > mon.y && mon.y + mon.h - config.posy >= height)) + menu->y = config.posy; + else if (mon.y + mon.h > height) + menu->y = mon.y + mon.h - height; + } else { /* else, calculate in respect to parent menu */ + int parentwidth; - if (screengeom.screenh - screengeom.cursy >= menu->h) - menu->y = screengeom.cursy; - else if (screengeom.screenh > menu->h) - menu->y = screengeom.screenh - menu->h; + parentwidth = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels; - XStringListToTextProperty(menutitle, menutitlecount, &textprop); - } 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; + if (mon.x + mon.w - parentwidth >= width) + menu->x = parentwidth; + else if (menu->parent->x > menu->w + config.border_pixels + config.gap_pixels) + menu->x = menu->parent->x - menu->w - config.border_pixels - config.gap_pixels; - if (screengeom.screenh - (menu->caller->y + menu->parent->y) > menu->h) + if (mon.y + mon.h - (menu->caller->y + menu->parent->y) >= height) 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) - menu->y = screengeom.screenh - menu->h; - - XStringListToTextProperty(&(menu->caller->output), 1, &textprop); + else if (mon.y + mon.h > height) + menu->y = mon.y + mon.h - height; } +} + +/* recursivelly setup menu configuration and its pixmap */ +static void +setupmenu(struct Menu *menu, XClassHint *classh) +{ + char *title; + struct Item *item; + XWindowChanges changes; + XSizeHints sizeh; + XTextProperty wintitle; + + /* setup size and position of menus */ + setupitems(menu); + setupmenupos(menu); /* update menu geometry */ + changes.border_width = config.border_pixels; changes.height = menu->h; changes.width = menu->w; changes.x = menu->x; changes.y = menu->y; - XConfigureWindow(dpy, menu->win, CWWidth | CWHeight | CWX | CWY, &changes); + XConfigureWindow(dpy, menu->win, CWBorderWidth | CWWidth | CWHeight | CWX | CWY, &changes); + + /* set window title (used if wflag is on) */ + if (menu->parent == NULL) { + title = classh->res_name; + } else { + title = menu->caller->output; + } + XStringListToTextProperty(&title, 1, &wintitle); /* set window manager hints */ - sizeh.flags = PMaxSize | PMinSize; + sizeh.flags = USPosition | PMaxSize | PMinSize; sizeh.min_width = sizeh.max_width = menu->w; sizeh.min_height = sizeh.max_height = menu->h; - XSetWMProperties(dpy, menu->win, &textprop, NULL, NULL, 0, &sizeh, - NULL, &classh); + XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh); - /* create pixmap and XftDraw */ - menu->pixmap = XCreatePixmap(dpy, menu->win, menu->w, menu->h, - DefaultDepth(dpy, screen)); - menu->draw = XftDrawCreate(dpy, menu->pixmap, visual, colormap); + /* set WM protocols and ewmh window properties */ + XSetWMProtocols(dpy, menu->win, &wmdelete, 1); + XChangeProperty(dpy, menu->win, netatom[NetWMName], utf8string, 8, + PropModeReplace, (unsigned char *)title, strlen(title)); + XChangeProperty(dpy, menu->win, netatom[NetWMWindowType], XA_ATOM, 32, + PropModeReplace, + (unsigned char *)&netatom[NetWMWindowTypePopupMenu], 1); /* calculate positions of submenus */ for (item = menu->list; item != NULL; item = item->next) { if (item->submenu != NULL) - calcmenu(item->submenu); + setupmenu(item->submenu, classh); } } @@ -532,60 +886,161 @@ grabkeyboard(void) errx(1, "cannot grab keyboard"); } -/* get menu and item of given window and position */ +/* load and scale icon */ +static Imlib_Image +loadicon(const char *file) +{ + Imlib_Image icon; + int width; + int height; + int imgsize; + + icon = imlib_load_image(file); + if (icon == NULL) + errx(1, "cannot load icon %s", file); + + imlib_context_set_image(icon); + + width = imlib_image_get_width(); + height = imlib_image_get_height(); + imgsize = MIN(width, height); + + icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, + config.iconsize, + config.iconsize); + + return icon; +} + +/* draw pixmap for the selected and unselected version of each item on menu */ static void -getmenuitem(Window win, int y, - struct Menu **menu_ret, struct Item **item_ret) +drawitems(struct Menu *menu) { - struct Menu *menu = NULL; - struct Item *item = NULL; + struct Item *item; - 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; - } + for (item = menu->list; item != NULL; item = item->next) { + XftDraw *dsel, *dunsel; + int x, y; + + item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h, + DefaultDepth(dpy, screen)); + + XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel); + XFillRectangle(dpy, item->unsel, dc.gc, 0, 0, menu->w, item->h); + + if (item->label == NULL) { /* item is separator */ + y = item->h/2; + XSetForeground(dpy, dc.gc, dc.separator.pixel); + XDrawLine(dpy, item->unsel, dc.gc, config.horzpadding, y, + menu->w - config.horzpadding, y); + + item->sel = item->unsel; + } else { + + item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h, + DefaultDepth(dpy, screen)); + XSetForeground(dpy, dc.gc, dc.selected[ColorBG].pixel); + XFillRectangle(dpy, item->sel, dc.gc, 0, 0, menu->w, item->h); + + /* draw text */ + x = config.horzpadding; + x += (iflag || !menu->hasicon) ? 0 : config.horzpadding + config.iconsize; + dsel = XftDrawCreate(dpy, item->sel, visual, colormap); + dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap); + XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); + drawtext(dsel, &dc.selected[ColorFG], x, 0, item->h, item->label); + XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); + drawtext(dunsel, &dc.normal[ColorFG], x, 0, item->h, item->label); + XftDrawDestroy(dsel); + XftDrawDestroy(dunsel); + + /* draw triangle */ + if (item->submenu != NULL) { + x = menu->w - config.triangle_width - config.horzpadding; + y = (item->h - config.triangle_height + 1) / 2; + + XPoint triangle[] = { + {x, y}, + {x + config.triangle_width, y + config.triangle_height/2}, + {x, y + config.triangle_height}, + {x, y} + }; + + XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); + XFillPolygon(dpy, item->sel, dc.gc, triangle, LEN(triangle), + Convex, CoordModeOrigin); + XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); + XFillPolygon(dpy, item->unsel, dc.gc, triangle, LEN(triangle), + Convex, CoordModeOrigin); + } + + /* draw icon */ + if (item->file != NULL && !iflag) { + item->icon = loadicon(item->file); + + imlib_context_set_image(item->icon); + imlib_context_set_drawable(item->sel); + imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); + imlib_context_set_drawable(item->unsel); + imlib_render_image_on_drawable(config.horzpadding, config.iconpadding); } } } +} +/* copy pixmaps of items of the current menu and of its ancestors into menu window */ +static void +drawmenus(struct Menu *currmenu) +{ + struct Menu *menu; + struct Item *item; -done: - *menu_ret = menu; - *item_ret = item; + for (menu = currmenu; menu != NULL; menu = menu->parent) { + if (!menu->drawn) { + drawitems(menu); + menu->drawn = 1; + } + for (item = menu->list; item != NULL; item = item->next) { + if (item == menu->selected) + XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0, + menu->w, item->h, 0, item->y); + else + XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0, + menu->w, item->h, 0, item->y); + } + } } -/* set currentmenu to menu, umap previous menus and map current menu and its parents */ +/* umap previous menus and map current menu and its parents */ static void -setcurrmenu(struct Menu *currmenu_new) +mapmenu(struct Menu *currmenu) { + static struct Menu *prevmenu = NULL; 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) + /* do not remap current menu if it wasn't updated*/ + if (prevmenu == currmenu) return; - /* if there was no currmenu, skip calculations */ - if (currmenu == NULL) { - currmenu = currmenu_new; + /* if this is the first time mapping, skip calculations */ + if (prevmenu == NULL) { + XMapWindow(dpy, currmenu->win); + prevmenu = currmenu; 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 { + minlevel = MIN(currmenu->level, prevmenu->level); + maxlevel = MAX(currmenu->level, prevmenu->level); + if (currmenu->level == maxlevel) { menu = currmenu; - menu_ = currmenu_new; + menu_ = prevmenu; + } else { + menu = prevmenu; + menu_ = currmenu; } while (menu->level > minlevel) menu = menu->parent; @@ -596,85 +1051,57 @@ setcurrmenu(struct Menu *currmenu_new) lcamenu = menu; /* unmap menus from currmenu (inclusive) until lcamenu (exclusive) */ - for (menu = currmenu; menu != lcamenu; menu = menu->parent) { + for (menu = prevmenu; menu != lcamenu; menu = menu->parent) { menu->selected = NULL; XUnmapWindow(dpy, menu->win); } - currmenu = currmenu_new; - /* map menus from currmenu (inclusive) until lcamenu (exclusive) */ - item = NULL; for (menu = currmenu; menu != lcamenu; menu = menu->parent) { + + if (wflag) { + setupmenupos(menu); + XMoveWindow(dpy, menu->win, menu->x, menu->y); + } + XMapWindow(dpy, menu->win); - if (item != NULL) - menu->selected = item; - item = menu->caller; } + + prevmenu = currmenu; } -/* draw items of the current menu and of its ancestors */ -static void -drawmenu(void) +/* get menu of given window */ +static struct Menu * +getmenu(struct Menu *currmenu, Window win) { struct Menu *menu; - struct Item *item; - for (menu = currmenu; menu != NULL; menu = menu->parent) { - for (item = menu->list; item != NULL; item = item->next) { - XftColor *color; - int labelx, labely; + for (menu = currmenu; menu != NULL; menu = menu->parent) + if (menu->win == win) + return menu; - /* determine item color */ - if (item == menu->selected) - color = dc.selected; - else - color = dc.normal; + return NULL; +} - /* continue if item is a separator */ - if (item->label == NULL) - continue; - - /* 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); - - /* 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; +/* get item of given menu and position */ +static struct Item * +getitem(struct Menu *menu, int y) +{ + struct Item *item; - XPoint triangle[] = { - {trianglex, triangley}, - {trianglex + item->h/8 + 1, item->y + item->h/2}, - {trianglex, triangley + item->h/4 + 2}, - {trianglex, triangley} - }; + if (menu == NULL) + return NULL; - XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle), - Convex, CoordModeOrigin); - } + for (item = menu->list; item != NULL; item = item->next) + if (y >= item->y && y <= item->y + item->h) + return item; - XCopyArea(dpy, menu->pixmap, menu->win, dc.gc, 0, item->y, - menu->w, item->h, 0, item->y); - } - } + return NULL; } /* cycle through the items; non-zero direction is next, zero is prev */ static struct Item * -itemcycle(int direction) +itemcycle(struct Menu *currmenu, int direction) { struct Item *item; struct Item *lastitem; @@ -715,7 +1142,7 @@ itemcycle(int direction) /* run event loop */ static void -run(void) +run(struct Menu *currmenu) { struct Menu *menu; struct Item *item; @@ -723,55 +1150,58 @@ run(void) KeySym ksym; XEvent ev; + mapmenu(currmenu); + while (!XNextEvent(dpy, &ev)) { switch(ev.type) { case Expose: if (ev.xexpose.count == 0) - drawmenu(); + drawmenus(currmenu); 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(currmenu, ev.xbutton.window); + item = getitem(menu, ev.xbutton.y); + if (menu == NULL || item == NULL || previtem == item) + break; + previtem = item; + menu->selected = item; + if (item->submenu != NULL) { + currmenu = item->submenu; + currmenu->selected = NULL; + } else { + currmenu = menu; } + mapmenu(currmenu); + drawmenus(currmenu); 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(currmenu, 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) { + currmenu = item->submenu; } else { + printf("%s\n", item->output); return; } + mapmenu(currmenu); + currmenu->selected = currmenu->list; + drawmenus(currmenu); + break; case ButtonPress: - getmenuitem(ev.xbutton.window, ev.xbutton.y, &menu, &item); - if (menu == NULL || item == NULL) + menu = getmenu(currmenu, ev.xbutton.window); + if (menu == NULL) return; break; case KeyPress: ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0); - if (ksym == XK_Escape && currmenu == rootmenu) + /* esc closes xmenu when current menu is the root menu */ + if (ksym == XK_Escape && currmenu->parent == NULL) return; /* Shift-Tab = ISO_Left_Tab */ @@ -781,9 +1211,9 @@ selectitem: /* cycle through menu */ item = NULL; if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) { - item = itemcycle(ITEMPREV); + item = itemcycle(currmenu, ITEMPREV); } else if (ksym == XK_Tab || ksym == XK_Down) { - item = itemcycle(ITEMNEXT); + item = itemcycle(currmenu, ITEMNEXT); } else if ((ksym == XK_Return || ksym == XK_Right) && currmenu->selected != NULL) { item = currmenu->selected; @@ -791,47 +1221,92 @@ selectitem: } else if ((ksym == XK_Escape || ksym == XK_Left) && currmenu->parent != NULL) { item = currmenu->parent->selected; - setcurrmenu(currmenu->parent); + currmenu = currmenu->parent; + mapmenu(currmenu); } else break; currmenu->selected = item; - drawmenu(); + drawmenus(currmenu); break; case LeaveNotify: + previtem = NULL; currmenu->selected = NULL; - drawmenu(); + drawmenus(currmenu); + break; + case ConfigureNotify: + menu = getmenu(currmenu, ev.xconfigure.window); + if (menu == NULL) + break; + menu->x = ev.xconfigure.x; + menu->y = ev.xconfigure.y; + break; + case ClientMessage: + if ((unsigned long) ev.xclient.data.l[0] != wmdelete) + break; + /* user closed window */ + menu = getmenu(currmenu, ev.xclient.window); + if (menu->parent == NULL) + return; /* closing the root menu closes the program */ + currmenu = menu->parent; + mapmenu(currmenu); break; } } } -/* recursivelly free a pixmap */ +/* recursivelly free pixmaps and destroy windows */ static void -freewindow(struct Menu *menu) +cleanmenu(struct Menu *menu) { struct Item *item; + struct Item *tmp; - for (item = menu->list; item != NULL; item = item->next) + item = menu->list; + while (item != NULL) { if (item->submenu != NULL) - freewindow(item->submenu); + cleanmenu(item->submenu); + tmp = item; + if (menu->drawn) { + XFreePixmap(dpy, item->unsel); + if (tmp->label != NULL) + XFreePixmap(dpy, item->sel); + } + if (tmp->label != tmp->output) + free(tmp->label); + free(tmp->output); + if (tmp->file != NULL) { + free(tmp->file); + if (tmp->icon != NULL) { + imlib_context_set_image(tmp->icon); + imlib_free_image(); + } + } + item = item->next; + free(tmp); + } - XFreePixmap(dpy, menu->pixmap); - XftDrawDestroy(menu->draw); XDestroyWindow(dpy, menu->win); + free(menu); } -/* cleanup and exit */ +/* cleanup X and exit */ static void cleanup(void) { - freewindow(rootmenu); + size_t i; + + XUngrabPointer(dpy, CurrentTime); + XUngrabKeyboard(dpy, CurrentTime); 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]); + XftColorFree(dpy, visual, colormap, &dc.separator); + XftColorFree(dpy, visual, colormap, &dc.border); + + for (i = 0; i < dc.nfonts; i++) + XftFontClose(dpy, dc.fonts[i]); XFreeGC(dpy, dc.gc); XCloseDisplay(dpy); @@ -841,6 +1316,6 @@ cleanup(void) static void usage(void) { - (void)fprintf(stderr, "usage: xmenu title...\n"); + (void)fprintf(stderr, "usage: xmenu [-fiw] [-p position] [title]\n"); exit(1); }