X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/f8ffe0b2e4688e2a699cc5e4bc2233644722e3ba..675a2008a6c9ad34d199aebdac6447d33a9cb53e:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 2e9f389..56a3dd4 100644 --- a/xmenu.c +++ b/xmenu.c @@ -1,97 +1,76 @@ #include +#include #include #include #include +#include +#include #include #include +#include #include #include #include #include +#include +#include "xmenu.h" -#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 border; - XftColor separator; - - GC gc; - XftFont *font; -}; - -/* menu geometry structure */ -struct Geometry { - int border; /* window border width */ - int separator; /* menu separator width */ - int itemw, itemh; /* item width and height */ - 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 */ -}; - -/* functions declarations */ -static void getresources(void); -static void getcolor(const char *s, XftColor *color); -static void setupdc(void); -static void calcgeom(struct Geometry *geom); -static struct Item *allocitem(const char *label, const char *output); +/* + * Function declarations + */ + +/* argument parser */ +static void parseposition(const char *optarg); + +/* initializers, and their helper routines */ +static void ealloccolor(const char *s, XftColor *color); +static void initresources(void); +static void initdc(void); +static void initconfig(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 struct Menu *buildmenutree(unsigned level, const char *label, const char *output); +static struct Menu *buildmenutree(unsigned level, const char *label, const char *output, char *file); static struct Menu *parsestdin(void); -static void setupmenusize(struct Geometry *geom, struct Menu *menu); -static void setupmenupos(struct Geometry *geom, struct Menu *menu); -static void setupmenu(struct Geometry *geom, struct Menu *menu); + +/* image loader */ +static Imlib_Image loadicon(const char *file); + +/* 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 struct Menu *getmenu(struct Menu *currmenu, Window win); -static struct Item *getitem(struct Menu *menu, int y); + +/* window drawers and mappers */ static void mapmenu(struct Menu *currmenu); static void drawseparator(struct Menu *menu, struct Item *item); static void drawitem(struct Menu *menu, struct Item *item, XftColor *color); static void drawmenu(struct Menu *currmenu); + +/* main event loop, and its helper routines */ +static struct Menu *getmenu(struct Menu *currmenu, Window win); +static struct Item *getitem(struct Menu *menu, int y); static struct Item *itemcycle(struct Menu *currmenu, int direction); static void run(struct Menu *currmenu); -static void freemenu(struct Menu *menu); + +/* cleaners */ +static void cleanmenu(struct Menu *menu); static void cleanup(void); + +/* show usage */ static void usage(void); + +/* + * Variable declarations + */ + /* X stuff */ static Display *dpy; static int screen; @@ -99,19 +78,43 @@ static Visual *visual; static Window rootwin; static Colormap colormap; static struct DC dc; +static Atom utf8string; +static Atom wmdelete; +static Atom netatom[NetLast]; +/* flags */ +static int iflag = 0; /* whether to disable icons */ +static int pflag = 0; /* whether the user specified a position */ +static int wflag = 0; /* whether to let the window manager control XMenu */ + +/* include config variable */ #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; - struct Geometry geom; + XClassHint classh; int ch; - while ((ch = getopt(argc, argv, "")) != -1) { + while ((ch = getopt(argc, argv, "ip:w")) != -1) { switch (ch) { + case 'i': + iflag = 1; + break; + case 'p': + pflag = 1; + parseposition(optarg); + break; + case 'w': + wflag = 1; + break; default: usage(); break; @@ -120,7 +123,7 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - if (argc != 0) + if (argc > 1) usage(); /* open connection to server and set X variables */ @@ -131,34 +134,85 @@ main(int argc, char *argv[]) rootwin = RootWindow(dpy, screen); colormap = DefaultColormap(dpy, screen); - /* setup */ - getresources(); - setupdc(); - calcgeom(&geom); + /* 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); + } + + /* initializers */ + initresources(); + initdc(); + initconfig(); + 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"); - setupmenu(&geom, rootmenu); + setupmenu(rootmenu, &classh); /* grab mouse and keyboard */ - grabpointer(); - grabkeyboard(); + if (!wflag) { + grabpointer(); + grabkeyboard(); + } /* run event loop */ run(rootmenu); /* freeing stuff */ - freemenu(rootmenu); + cleanmenu(rootmenu); cleanup(); return 0; } +/* parse position string from -p, put results on config.x and config.y */ +static void +parseposition(const char *optarg) +{ + long n; + const 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 || *endp != '\0') + goto error; + config.posy = n; + + return; + +error: + errx(1, "improper position: %s", optarg); +} + +/* get color from color string */ +static void +ealloccolor(const char *s, XftColor *color) +{ + if(!XftColorAllocName(dpy, visual, colormap, s, color)) + errx(1, "cannot allocate color: %s", s); +} + /* read xrdb for configuration options */ static void -getresources(void) +initresources(void) { char *xrm; long n; @@ -174,82 +228,86 @@ getresources(void) if (XrmGetResource(xdb, "xmenu.borderWidth", "*", &type, &xval) == True) if ((n = strtol(xval.addr, NULL, 10)) > 0) - border_pixels = n; + config.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) + config.separator_pixels = n; + if (XrmGetResource(xdb, "xmenu.height", "*", &type, &xval) == True) if ((n = strtol(xval.addr, NULL, 10)) > 0) - padding_pixels = n; + config.height_pixels = n; if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True) if ((n = strtol(xval.addr, NULL, 10)) > 0) - width_pixels = n; + 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) - background_color = strdup(xval.addr); + config.background_color = strdup(xval.addr); if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True) - foreground_color = strdup(xval.addr); + config.foreground_color = strdup(xval.addr); if (XrmGetResource(xdb, "xmenu.selbackground", "*", &type, &xval) == True) - selbackground_color = strdup(xval.addr); + config.selbackground_color = strdup(xval.addr); if (XrmGetResource(xdb, "xmenu.selforeground", "*", &type, &xval) == True) - selforeground_color = strdup(xval.addr); + config.selforeground_color = strdup(xval.addr); if (XrmGetResource(xdb, "xmenu.separator", "*", &type, &xval) == True) - separator_color = strdup(xval.addr); + config.separator_color = strdup(xval.addr); if (XrmGetResource(xdb, "xmenu.border", "*", &type, &xval) == True) - border_color = strdup(xval.addr); + config.border_color = strdup(xval.addr); if (XrmGetResource(xdb, "xmenu.font", "*", &type, &xval) == True) - font = strdup(xval.addr); + config.font = strdup(xval.addr); XrmDestroyDatabase(xdb); } -/* 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); -} - /* init draw context */ static void -setupdc(void) +initdc(void) { /* get color pixels */ - 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); + 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); /* try to get font */ - if ((dc.font = XftFontOpenName(dpy, screen, font)) == NULL) + if ((dc.font = XftFontOpenName(dpy, screen, config.font)) == NULL) errx(1, "cannot load font"); /* create common GC */ dc.gc = XCreateGC(dpy, rootwin, 0, NULL); } -/* calculate menu and screen geometry */ +/* calculate configuration values that are not set manually */ +static void +initconfig(void) +{ + Window dw; /* dummy variable */ + int di; /* dummy variable */ + unsigned du; /* dummy variable */ + + if (!pflag) /* if the user haven't specified a position, use cursor position*/ + XQueryPointer(dpy, rootwin, &dw, &dw, &config.posx, &config.posy, &di, &di, &du); + config.screenw = DisplayWidth(dpy, screen); + config.screenh = DisplayHeight(dpy, screen); + config.iconsize = config.height_pixels - config.iconpadding * 2; +} + +/* intern atoms */ static void -calcgeom(struct Geometry *geom) +initatoms(void) { - Window w1, w2; /* unused variables */ - int a, b; /* unused variables */ - unsigned mask; /* unused variable */ - - XQueryPointer(dpy, rootwin, &w1, &w2, &geom->cursx, &geom->cursy, &a, &b, &mask); - geom->screenw = DisplayWidth(dpy, screen); - geom->screenh = DisplayHeight(dpy, screen); - geom->itemh = dc.font->height + padding_pixels * 2; - geom->itemw = width_pixels; - geom->border = border_pixels; - geom->separator = separator_pixels; + 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; @@ -268,6 +326,12 @@ allocitem(const char *label, const char *output) err(1, "strdup"); } } + if (file == NULL) { + item->file = NULL; + } else { + if ((item->file = strdup(file)) == NULL) + err(1, "strdup"); + } item->y = 0; item->h = 0; if (item->label == NULL) @@ -276,11 +340,12 @@ allocitem(const char *label, const char *output) item->labellen = strlen(item->label); 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) { @@ -299,12 +364,14 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) menu->y = 0; /* calculated by setupmenu() */ menu->level = level; - swa.override_redirect = True; + swa.override_redirect = (wflag) ? False : True; swa.background_pixel = dc.normal[ColorBG].pixel; swa.border_pixel = dc.border.pixel; swa.save_under = True; /* pop-up windows should save_under*/ swa.event_mask = ExposureMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask | LeaveWindowMask; + if (wflag) + swa.event_mask |= StructureNotifyMask; menu->win = XCreateWindow(dpy, rootwin, 0, 0, 1, 1, 0, CopyFromParent, CopyFromParent, CopyFromParent, CWOverrideRedirect | CWBackPixel | @@ -316,7 +383,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) /* build the menu tree */ static struct Menu * -buildmenutree(unsigned level, const char *label, const char *output) +buildmenutree(unsigned level, const char *label, const char *output, char *file) { static struct Menu *prevmenu = NULL; /* menu the previous item was added to */ static struct Menu *rootmenu = NULL; /* menu to be returned */ @@ -326,14 +393,14 @@ buildmenutree(unsigned level, const char *label, const char *output) unsigned i; /* create the item */ - curritem = allocitem(label, output); + 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; + 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; @@ -379,7 +446,7 @@ parsestdin(void) { struct Menu *rootmenu; char *s, buf[BUFSIZ]; - char *label, *output; + char *file, *label, *output; unsigned level = 0; rootmenu = NULL; @@ -392,6 +459,13 @@ parsestdin(void) 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"); + } + /* get the output */ output = strtok(NULL, "\n"); if (output == NULL) { @@ -401,108 +475,189 @@ parsestdin(void) output++; } - rootmenu = buildmenutree(level, label, output); + rootmenu = buildmenutree(level, label, output, file); } return rootmenu; } -/* setup the size of a menu and the position of its items */ +/* 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; +} + +/* setup the height, width and icon of the items of a menu */ static void -setupmenusize(struct Geometry *geom, struct Menu *menu) +setupitems(struct Menu *menu) { XGlyphInfo ext; struct Item *item; - int labelwidth; + int itemwidth; - menu->w = geom->itemw; + menu->w = config.width_pixels; for (item = menu->list; item != NULL; item = item->next) { item->y = menu->h; if (item->label == NULL) /* height for separator item */ - item->h = geom->separator; + item->h = config.separator_pixels; else - item->h = geom->itemh; + item->h = config.height_pixels; menu->h += item->h; /* get length of item->label rendered in the font */ XftTextExtentsUtf8(dpy, dc.font, (XftChar8 *)item->label, item->labellen, &ext); - labelwidth = ext.xOff + dc.font->height * 2; - menu->w = MAX(menu->w, labelwidth); + + /* + * set menu width + * + * the item width depends on the size of its label (ext.xOff), + * 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 before the label and around the triangle. + */ + itemwidth = ext.xOff + config.triangle_width + config.horzpadding * 3; + itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding; + menu->w = MAX(menu->w, itemwidth); + + /* create icon */ + if (item->file != NULL && !iflag) { + item->icon = loadicon(item->file); + + item->sel = XCreatePixmap(dpy, menu->win, + config.iconsize, config.iconsize, + DefaultDepth(dpy, screen)); + XSetForeground(dpy, dc.gc, dc.selected[ColorBG].pixel); + XFillRectangle(dpy, item->sel, dc.gc, 0, 0, + config.iconsize, config.iconsize); + imlib_context_set_drawable(item->sel); + imlib_context_set_image(item->icon); + imlib_render_image_on_drawable(0, 0); + + item->unsel = XCreatePixmap(dpy, menu->win, + config.iconsize, config.iconsize, + DefaultDepth(dpy, screen)); + XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel); + XFillRectangle(dpy, item->unsel, dc.gc, 0, 0, + config.iconsize, config.iconsize); + imlib_context_set_drawable(item->unsel); + imlib_context_set_image(item->icon); + imlib_render_image_on_drawable(0, 0); + } } } /* setup the position of a menu */ static void -setupmenupos(struct Geometry *geom, struct Menu *menu) +setupmenupos(struct Menu *menu) { int width, height; - width = menu->w + geom->border * 2; - height = menu->h + geom->border * 2; + 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 (geom->screenw - geom->cursx >= menu->w) - menu->x = geom->cursx; - else if (geom->cursx > width) - menu->x = geom->cursx - width; - - if (geom->screenh - geom->cursy >= height) - menu->y = geom->cursy; - else if (geom->screenh > height) - menu->y = geom->screenh - height; + if (pflag || config.screenw - config.posx >= menu->w) + menu->x = config.posx; + else if (config.posx > width) + menu->x = config.posx - width; + + if (pflag || config.screenh - config.posy >= height) + menu->y = config.posy; + else if (config.screenh > height) + menu->y = config.screenh - height; } else { /* else, calculate in respect to parent menu */ - if (geom->screenw - (menu->parent->x + menu->parent->w + geom->border) >= width) - menu->x = menu->parent->x + menu->parent->w + geom->border; - else if (menu->parent->x > menu->w + geom->border) - menu->x = menu->parent->x - menu->w - geom->border; + if (config.screenw - (menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels) >= width) + menu->x = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels; + 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 (geom->screenh - (menu->caller->y + menu->parent->y) > height) + if (config.screenh - (menu->caller->y + menu->parent->y) > height) menu->y = menu->caller->y + menu->parent->y; - else if (geom->screenh - menu->parent->y > height) + else if (config.screenh - menu->parent->y > height) menu->y = menu->parent->y; - else if (geom->screenh > height) - menu->y = geom->screenh - height; + else if (config.screenh > height) + menu->y = config.screenh - height; } } /* recursivelly setup menu configuration and its pixmap */ static void -setupmenu(struct Geometry *geom, struct Menu *menu) +setupmenu(struct Menu *menu, XClassHint *classh) { + char *title; struct Item *item; - static XClassHint classh = {PROGNAME, PROGNAME}; XWindowChanges changes; XSizeHints sizeh; + XTextProperty wintitle; /* setup size and position of menus */ - setupmenusize(geom, menu); - setupmenupos(geom, menu); + setupitems(menu); + setupmenupos(menu); /* update menu geometry */ - changes.border_width = geom->border; + 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, 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.min_width = sizeh.max_width = menu->w; sizeh.min_height = sizeh.max_height = menu->h; - XSetWMProperties(dpy, menu->win, NULL, NULL, NULL, 0, &sizeh, - NULL, &classh); + XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh); /* create pixmap and XftDraw */ menu->pixmap = XCreatePixmap(dpy, menu->win, menu->w, menu->h, 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) - setupmenu(geom, item->submenu); + setupmenu(item->submenu, classh); } } @@ -539,35 +694,6 @@ grabkeyboard(void) errx(1, "cannot grab keyboard"); } -/* get menu of given window */ -static struct Menu * -getmenu(struct Menu *currmenu, 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; - - for (item = menu->list; item != NULL; item = item->next) - if (y >= item->y && y <= item->y + item->h) - return item; - - return NULL; -} - /* umap previous menus and map current menu and its parents */ static void mapmenu(struct Menu *currmenu) @@ -615,6 +741,12 @@ mapmenu(struct Menu *currmenu) /* map menus from currmenu (inclusive) until lcamenu (exclusive) */ for (menu = currmenu; menu != lcamenu; menu = menu->parent) { + + if (wflag) { + setupmenupos(menu); + XMoveWindow(dpy, menu->win, menu->x, menu->y); + } + XMapWindow(dpy, menu->win); } @@ -630,7 +762,8 @@ drawseparator(struct Menu *menu, struct Item *item) y = item->y + item->h/2; XSetForeground(dpy, dc.gc, dc.separator.pixel); - XDrawLine(dpy, menu->pixmap, dc.gc, 0, y, menu->w, y); + XDrawLine(dpy, menu->pixmap, dc.gc, config.horzpadding, y, + menu->w - config.horzpadding, y); } /* draw regular item */ @@ -639,27 +772,40 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color) { int x, y; - x = dc.font->height; - y = item->y + item->h/2 + dc.font->ascent/2 - 1; + x = config.horzpadding; + x += (iflag) ? 0 : config.horzpadding + config.iconsize; + y = item->y + (item->h + dc.font->ascent) / 2; XSetForeground(dpy, dc.gc, color[ColorFG].pixel); XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font, - x, y, item->label, item->labellen); + x, y, (XftChar8 *)item->label, item->labellen); /* draw triangle, if item contains a submenu */ if (item->submenu != NULL) { - x = menu->w - dc.font->height/2 - triangle_width/2; - y = item->y + item->h/2 - triangle_height/2 - 1; + x = menu->w - config.triangle_width - config.horzpadding; + y = item->y + (item->h - config.triangle_height + 1) / 2; XPoint triangle[] = { {x, y}, - {x + triangle_width, y + triangle_height/2}, - {x, y + triangle_height}, + {x + config.triangle_width, y + config.triangle_height/2}, + {x, y + config.triangle_height}, {x, y} }; XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle), Convex, CoordModeOrigin); } + + /* draw icon */ + if (item->icon != NULL) { + x = config.horzpadding; + y = item->y + config.iconpadding; + if (color == dc.selected) + XCopyArea(dpy, item->sel, menu->pixmap, dc.gc, 0, 0, + menu->w, menu->h, x, y); + else + XCopyArea(dpy, item->unsel, menu->pixmap, dc.gc, 0, 0, + menu->w, menu->h, x, y); + } } /* draw items of the current menu and of its ancestors */ @@ -695,6 +841,35 @@ drawmenu(struct Menu *currmenu) } } +/* get menu of given window */ +static struct Menu * +getmenu(struct Menu *currmenu, 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; + + for (item = menu->list; item != NULL; item = item->next) + if (y >= item->y && y <= item->y + item->h) + return item; + + return NULL; +} + /* cycle through the items; non-zero direction is next, zero is prev */ static struct Item * itemcycle(struct Menu *currmenu, int direction) @@ -829,13 +1004,30 @@ selectitem: currmenu->selected = NULL; drawmenu(currmenu); break; + case ConfigureNotify: + menu = getmenu(currmenu, ev.xconfigure.window); + if (menu == NULL) + break; + menu->x = ev.xconfigure.x; + menu->y = ev.xconfigure.y; + break; + case ClientMessage: + 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 pixmaps and destroy windows */ static void -freemenu(struct Menu *menu) +cleanmenu(struct Menu *menu) { struct Item *item; struct Item *tmp; @@ -843,12 +1035,19 @@ freemenu(struct Menu *menu) item = menu->list; while (item != NULL) { if (item->submenu != NULL) - freemenu(item->submenu); + cleanmenu(item->submenu); tmp = item; - item = item->next; 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); } @@ -858,7 +1057,7 @@ freemenu(struct Menu *menu) free(menu); } -/* cleanup and exit */ +/* cleanup X and exit */ static void cleanup(void) { @@ -880,6 +1079,6 @@ cleanup(void) static void usage(void) { - (void)fprintf(stderr, "usage: xmenu\n"); + (void)fprintf(stderr, "usage: xmenu [-iw] [-p position] [title]\n"); exit(1); }