X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/f8ffe0b2e4688e2a699cc5e4bc2233644722e3ba..721517254c50f99724948541c2fbe500db1b1952:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 2e9f389..2096e70 100644 --- a/xmenu.c +++ b/xmenu.c @@ -8,10 +8,12 @@ #include #include #include +#include #define PROGNAME "xmenu" #define ITEMPREV 0 #define ITEMNEXT 1 +#define IMGPADDING 8 /* macros */ #define LEN(x) (sizeof (x) / sizeof (x[0])) @@ -45,12 +47,14 @@ struct Geometry { struct Item { char *label; /* string to be drawed on menu */ char *output; /* string to be outputed when item is clicked */ + char *file; /* filename of the icon */ 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 */ + Imlib_Image icon; }; /* menu structure */ @@ -71,13 +75,13 @@ 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); +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); +static void setupmenu(struct Geometry *geom, struct Menu *menu, XClassHint *classh); static void grabpointer(void); static void grabkeyboard(void); static struct Menu *getmenu(struct Menu *currmenu, Window win); @@ -99,6 +103,10 @@ static Visual *visual; static Window rootwin; static Colormap colormap; static struct DC dc; +static Atom wmdelete; + +/* flags */ +static int wflag = 0; /* whether to let the window manager control XMenu */ #include "config.h" @@ -108,10 +116,14 @@ 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, "w")) != -1) { switch (ch) { + case 'w': + wflag = 1; + break; default: usage(); break; @@ -120,7 +132,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 */ @@ -130,21 +142,38 @@ main(int argc, char *argv[]) visual = DefaultVisual(dpy, screen); rootwin = RootWindow(dpy, screen); colormap = DefaultColormap(dpy, screen); + wmdelete=XInternAtom(dpy, "WM_DELETE_WINDOW", True); + + /* imlib2 stuff */ + 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); /* setup */ getresources(); setupdc(); calcgeom(&geom); + /* 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(&geom, rootmenu, &classh); /* grab mouse and keyboard */ - grabpointer(); - grabkeyboard(); + if (!wflag) { + grabpointer(); + grabkeyboard(); + } /* run event loop */ run(rootmenu); @@ -249,7 +278,7 @@ calcgeom(struct Geometry *geom) /* 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 +297,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,6 +311,7 @@ allocitem(const char *label, const char *output) item->labellen = strlen(item->label); item->next = NULL; item->submenu = NULL; + item->icon = NULL; return item; } @@ -299,24 +335,28 @@ 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 | CWBorderPixel | CWEventMask | CWSaveUnder, &swa); + XSetWMProtocols(dpy, menu->win, &wmdelete, 1); + return menu; } /* 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,7 +366,7 @@ 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 */ @@ -379,7 +419,7 @@ parsestdin(void) { struct Menu *rootmenu; char *s, buf[BUFSIZ]; - char *label, *output; + char *file, *label, *output; unsigned level = 0; rootmenu = NULL; @@ -392,6 +432,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,12 +448,36 @@ parsestdin(void) output++; } - rootmenu = buildmenutree(level, label, output); + rootmenu = buildmenutree(level, label, output, file); } return rootmenu; } +/* load and scale icon */ +static Imlib_Image +loadicon(const char *file, int size) +{ + 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, size, size); + + return icon; +} + /* setup the size of a menu and the position of its items */ static void setupmenusize(struct Geometry *geom, struct Menu *menu) @@ -428,17 +499,29 @@ setupmenusize(struct Geometry *geom, struct Menu *menu) /* 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; + labelwidth = ext.xOff + dc.font->height * 2 + IMGPADDING * 2; menu->w = MAX(menu->w, labelwidth); + + /* create icon */ + if (item->file != NULL) + item->icon = loadicon(item->file, dc.font->height); } } /* setup the position of a menu */ static void -setupmenupos(struct Geometry *geom, struct Menu *menu) +setupmenupos(struct Geometry *g, struct Menu *menu) { + static struct Geometry *geom = NULL; int width, height; + /* + * Save the geometry so functions can call setupmenupos() without + * having to know the geometry. + */ + if (g != NULL) + geom = g; + width = menu->w + geom->border * 2; height = menu->h + geom->border * 2; if (menu->parent == NULL) { /* if root menu, calculate in respect to cursor */ @@ -468,12 +551,12 @@ setupmenupos(struct Geometry *geom, struct Menu *menu) /* recursivelly setup menu configuration and its pixmap */ static void -setupmenu(struct Geometry *geom, struct Menu *menu) +setupmenu(struct Geometry *geom, struct Menu *menu, XClassHint *classh) { struct Item *item; - static XClassHint classh = {PROGNAME, PROGNAME}; XWindowChanges changes; XSizeHints sizeh; + XTextProperty wintitle; /* setup size and position of menus */ setupmenusize(geom, menu); @@ -487,12 +570,18 @@ setupmenu(struct Geometry *geom, struct Menu *menu) 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) { + XStringListToTextProperty(&classh->res_name, 1, &wintitle); + } else { + XStringListToTextProperty(&menu->caller->output, 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, @@ -502,7 +591,7 @@ setupmenu(struct Geometry *geom, struct Menu *menu) /* calculate positions of submenus */ for (item = menu->list; item != NULL; item = item->next) { if (item->submenu != NULL) - setupmenu(geom, item->submenu); + setupmenu(geom, item->submenu, classh); } } @@ -615,6 +704,12 @@ mapmenu(struct Menu *currmenu) /* map menus from currmenu (inclusive) until lcamenu (exclusive) */ for (menu = currmenu; menu != lcamenu; menu = menu->parent) { + + if (wflag) { + setupmenupos(NULL, menu); + XMoveWindow(dpy, menu->win, menu->x, menu->y); + } + XMapWindow(dpy, menu->win); } @@ -639,7 +734,7 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color) { int x, y; - x = dc.font->height; + x = dc.font->height + IMGPADDING; y = item->y + item->h/2 + dc.font->ascent/2 - 1; XSetForeground(dpy, dc.gc, color[ColorFG].pixel); XftDrawStringUtf8(menu->draw, &color[ColorFG], dc.font, @@ -647,7 +742,7 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color) /* draw triangle, if item contains a submenu */ if (item->submenu != NULL) { - x = menu->w - dc.font->height/2 - triangle_width/2; + x = menu->w - dc.font->height/2 - IMGPADDING/2 - triangle_width/2 - 1; y = item->y + item->h/2 - triangle_height/2 - 1; XPoint triangle[] = { @@ -660,6 +755,15 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color) XFillPolygon(dpy, menu->pixmap, dc.gc, triangle, LEN(triangle), Convex, CoordModeOrigin); } + + /* draw icon */ + if (item->file != NULL) { + x = IMGPADDING / 2; + y = item->y + (item->h - dc.font->height) / 2; + imlib_context_set_drawable(menu->pixmap); + imlib_context_set_image(item->icon); + imlib_render_image_on_drawable(x, y); + } } /* draw items of the current menu and of its ancestors */ @@ -829,6 +933,21 @@ 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: + /* 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; } } } @@ -845,10 +964,17 @@ freemenu(struct Menu *menu) if (item->submenu != NULL) freemenu(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); } @@ -880,6 +1006,6 @@ cleanup(void) static void usage(void) { - (void)fprintf(stderr, "usage: xmenu\n"); + (void)fprintf(stderr, "usage: xmenu [-w] [title]\n"); exit(1); }