X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/33376f5420409013cf1d67cfb8800067f63f12d3..d94ef325156464f68e89aff2ce19caf8ddba075d:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 6f75c2c..64dd46b 100644 --- a/xmenu.c +++ b/xmenu.c @@ -13,7 +13,6 @@ #define PROGNAME "xmenu" #define ITEMPREV 0 #define ITEMNEXT 1 -#define IMGPADDING 8 /* macros */ #define LEN(x) (sizeof (x) / sizeof (x[0])) @@ -47,14 +46,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 image */ + 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 image; + Imlib_Image icon; }; /* menu structure */ @@ -79,9 +78,10 @@ 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, char *file); static struct Menu *parsestdin(void); +static Imlib_Image loadicon(const char *file, int size); 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); @@ -103,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" @@ -112,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; @@ -124,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 */ @@ -134,6 +142,7 @@ 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); @@ -147,15 +156,24 @@ main(int argc, char *argv[]) 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); @@ -189,9 +207,9 @@ getresources(void) if (XrmGetResource(xdb, "xmenu.separatorWidth", "*", &type, &xval) == True) if ((n = strtol(xval.addr, NULL, 10)) > 0) separator_pixels = n; - if (XrmGetResource(xdb, "xmenu.padding", "*", &type, &xval) == True) + if (XrmGetResource(xdb, "xmenu.height", "*", &type, &xval) == True) if ((n = strtol(xval.addr, NULL, 10)) > 0) - padding_pixels = n; + height_pixels = n; if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True) if ((n = strtol(xval.addr, NULL, 10)) > 0) width_pixels = n; @@ -252,7 +270,7 @@ calcgeom(struct Geometry *geom) 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->itemh = height_pixels; geom->itemw = width_pixels; geom->border = border_pixels; geom->separator = separator_pixels; @@ -293,7 +311,7 @@ allocitem(const char *label, const char *output, char *file) item->labellen = strlen(item->label); item->next = NULL; item->submenu = NULL; - item->image = NULL; + item->icon = NULL; return item; } @@ -317,18 +335,22 @@ 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; } @@ -348,10 +370,10 @@ buildmenutree(unsigned level, const char *label, const char *output, char *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; @@ -432,28 +454,28 @@ parsestdin(void) return rootmenu; } -/* load and scale image */ +/* load and scale icon */ static Imlib_Image -loadimage(const char *file, int size) +loadicon(const char *file, int size) { - Imlib_Image image; + Imlib_Image icon; int width; int height; int imgsize; - image = imlib_load_image(file); - if (image == NULL) - errx(1, "cannot load image %s", file); + icon = imlib_load_image(file); + if (icon == NULL) + errx(1, "cannot load icon %s", file); - imlib_context_set_image(image); + imlib_context_set_image(icon); width = imlib_image_get_width(); height = imlib_image_get_height(); imgsize = MIN(width, height); - image = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, size, size); + icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, size, size); - return image; + return icon; } /* setup the size of a menu and the position of its items */ @@ -477,21 +499,31 @@ 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 + IMGPADDING * 2; + + /* set menu width */ + labelwidth = ext.xOff + item->h * 2; menu->w = MAX(menu->w, labelwidth); - /* create image */ + /* create icon */ if (item->file != NULL) - item->image = loadimage(item->file, dc.font->height); + item->icon = loadicon(item->file, item->h - iconpadding * 2); } } /* 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 */ @@ -521,12 +553,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); @@ -540,12 +572,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, @@ -555,7 +593,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); } } @@ -668,6 +706,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); } @@ -692,16 +736,16 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color) { int x, y; - x = dc.font->height + IMGPADDING; - y = item->y + item->h/2 + dc.font->ascent/2 - 1; + x = item->h; + 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); /* draw triangle, if item contains a submenu */ if (item->submenu != NULL) { - x = menu->w - dc.font->height/2 - IMGPADDING/2 - triangle_width/2 - 1; - y = item->y + item->h/2 - triangle_height/2 - 1; + x = menu->w - (item->h + triangle_width + 1) / 2; + y = item->y + (item->h - triangle_height + 1) / 2; XPoint triangle[] = { {x, y}, @@ -714,12 +758,12 @@ drawitem(struct Menu *menu, struct Item *item, XftColor *color) Convex, CoordModeOrigin); } - /* draw image */ + /* draw icon */ if (item->file != NULL) { - x = IMGPADDING / 2; - y = item->y + (item->h - dc.font->height) / 2; + x = iconpadding; + y = item->y + iconpadding; imlib_context_set_drawable(menu->pixmap); - imlib_context_set_image(item->image); + imlib_context_set_image(item->icon); imlib_render_image_on_drawable(x, y); } } @@ -891,6 +935,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; } } } @@ -912,8 +971,8 @@ freemenu(struct Menu *menu) free(tmp->output); if (tmp->file != NULL) { free(tmp->file); - if (tmp->image != NULL) { - imlib_context_set_image(tmp->image); + if (tmp->icon != NULL) { + imlib_context_set_image(tmp->icon); imlib_free_image(); } } @@ -949,6 +1008,6 @@ cleanup(void) static void usage(void) { - (void)fprintf(stderr, "usage: xmenu\n"); + (void)fprintf(stderr, "usage: xmenu [-w] [title]\n"); exit(1); }