X-Git-Url: http://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/f8d55995dffb94166a38f510ea47bb0218e7bfbf..73a2a23dbd212da1047baca9982d2ffd4d0254bc:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 6e189cc..51412b3 100644 --- a/xmenu.c +++ b/xmenu.c @@ -17,72 +17,6 @@ #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 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); - -/* 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); - - -/* - * Variable declarations - */ - /* X stuff */ static Display *dpy; static int screen; @@ -96,7 +30,6 @@ 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 */ @@ -105,96 +38,12 @@ 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[]) +/* show usage */ +static void +usage(void) { - struct Menu *rootmenu; - XClassHint classh; - int ch; - - 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; - } - } - argc -= optind; - argv += optind; - - if (argc > 1) - usage(); - - /* open connection to server and set X variables */ - if ((dpy = XOpenDisplay(NULL)) == NULL) - errx(1, "cannot open display"); - screen = DefaultScreen(dpy); - visual = DefaultVisual(dpy, screen); - rootwin = RootWindow(dpy, screen); - colormap = DefaultColormap(dpy, screen); - - /* 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 */ - 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"); - setupmenu(rootmenu, &classh); - - /* grab mouse and keyboard */ - if (!wflag) { - grabpointer(); - grabkeyboard(); - } - - /* run event loop */ - run(rootmenu); - - /* freeing stuff */ - cleanmenu(rootmenu); - cleanup(); - - return 0; + (void)fprintf(stderr, "usage: xmenu [-iw] [-p position] [title]\n"); + exit(1); } /* parse position string from -p, @@ -237,7 +86,7 @@ error: errx(1, "improper position: %s", optarg); } -/* parse color string */ +/* parse font string */ static void parsefonts(const char *s) { @@ -260,14 +109,18 @@ parsefonts(const char *s) i = 0; while (isspace(*p)) p++; - while (*p != '\0' && *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"); + errx(1, "could not load font"); } } @@ -276,7 +129,7 @@ static void ealloccolor(const char *s, XftColor *color) { if(!XftColorAllocName(dpy, visual, colormap, s, color)) - errx(1, "cannot allocate color: %s", s); + errx(1, "could not allocate color: %s", s); } /* query monitor information and cursor position */ @@ -300,7 +153,7 @@ initmonitor(void) if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) { int selmon = 0; - if (!mflag || (mflag && (config.monitor < 0 || config.monitor >= nmons))) { + if (!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)) { @@ -316,6 +169,8 @@ initmonitor(void) mon.y = info[selmon].y_org; mon.w = info[selmon].width; mon.h = info[selmon].height; + + XFree(info); } if (!pflag) { @@ -331,9 +186,9 @@ initmonitor(void) static void initresources(void) { - char *xrm; long n; char *type; + char *xrm; XrmDatabase xdb; XrmValue xval; @@ -514,7 +369,7 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file) menu = menu->parent, i++) ; if (menu == NULL) - errx(1, "reached NULL menu"); + errx(1, "improper indentation detected"); /* find last item in the new menu */ for (item = menu->list; item->next != NULL; item = item->next) @@ -643,12 +498,49 @@ getnextutf8char(const char *s, const char **next_ret) static XftFont * getfontucode(FcChar32 ucode) { + FcCharSet *fccharset = NULL; + FcPattern *fcpattern = NULL; + FcPattern *match = NULL; + XftFont *retfont = NULL; + XftResult result; size_t i; for (i = 0; i < dc.nfonts; i++) if (XftCharExists(dpy, dc.fonts[i], ucode) == FcTrue) return dc.fonts[i]; - return NULL; + + /* create a charset containing our code point */ + fccharset = FcCharSetCreate(); + FcCharSetAddChar(fccharset, ucode); + + /* create a pattern akin to the dc.pattern but containing our charset */ + if (fccharset) { + fcpattern = FcPatternDuplicate(dc.pattern); + FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset); + } + + /* find pattern matching fcpattern */ + if (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 dc.fonts[dc.nfonts++]; + } else { + XftFontClose(dpy, retfont); + } + } + + /* in case no fount was found, return the first one */ + return dc.fonts[0]; } /* draw text into XftDraw, return width of text glyphs */ @@ -656,9 +548,6 @@ static int drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text) { 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; @@ -668,17 +557,16 @@ drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *t size_t len; ucode = getnextutf8char(text, &next); - if ((currfont = getfontucode(ucode)) == NULL) - currfont = dc.fonts[0]; + 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; + int texty; + + texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent; XftDrawStringUtf8(draw, color, currfont, x, texty, (XftChar8 *)text, len); x += ext.xOff; } @@ -831,7 +719,7 @@ grabpointer(void) return; nanosleep(&ts, NULL); } - errx(1, "cannot grab keyboard"); + errx(1, "could not grab pointer"); } /* try to grab keyboard, we may have to wait for another process to ungrab */ @@ -847,7 +735,7 @@ grabkeyboard(void) return; nanosleep(&ts, NULL); } - errx(1, "cannot grab keyboard"); + errx(1, "could not grab keyboard"); } /* load and scale icon */ @@ -855,13 +743,55 @@ static Imlib_Image loadicon(const char *file) { Imlib_Image icon; + Imlib_Load_Error errcode; + const char *errstr; int width; int height; int imgsize; - icon = imlib_load_image(file); - if (icon == NULL) - errx(1, "cannot load icon %s", file); + icon = imlib_load_image_with_error_return(file, &errcode); + if (*file == '\0') { + warnx("could not load icon (file name is blank)"); + return NULL; + } else if (icon == NULL) { + switch (errcode) { + case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST: + errstr = "file does not exist"; + break; + case IMLIB_LOAD_ERROR_FILE_IS_DIRECTORY: + errstr = "file is directory"; + break; + case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_READ: + case IMLIB_LOAD_ERROR_PERMISSION_DENIED_TO_WRITE: + errstr = "permission denied"; + break; + case IMLIB_LOAD_ERROR_NO_LOADER_FOR_FILE_FORMAT: + errstr = "unknown file format"; + break; + case IMLIB_LOAD_ERROR_PATH_TOO_LONG: + errstr = "path too long"; + break; + case IMLIB_LOAD_ERROR_PATH_COMPONENT_NON_EXISTANT: + case IMLIB_LOAD_ERROR_PATH_COMPONENT_NOT_DIRECTORY: + case IMLIB_LOAD_ERROR_PATH_POINTS_OUTSIDE_ADDRESS_SPACE: + errstr = "improper path"; + break; + case IMLIB_LOAD_ERROR_TOO_MANY_SYMBOLIC_LINKS: + errstr = "too many symbolic links"; + break; + case IMLIB_LOAD_ERROR_OUT_OF_MEMORY: + errstr = "out of memory"; + break; + case IMLIB_LOAD_ERROR_OUT_OF_FILE_DESCRIPTORS: + errstr = "out of file descriptors"; + break; + default: + errstr = "unknown error"; + break; + } + warnx("could not load icon (%s): %s", errstr, file); + return NULL; + } imlib_context_set_image(icon); @@ -938,15 +868,21 @@ drawitems(struct Menu *menu) Convex, CoordModeOrigin); } - /* draw icon */ - if (item->file != NULL && !iflag) { + /* try to load icon */ + if (item->file && !iflag) { item->icon = loadicon(item->file); + free(item->file); + } + /* draw icon if properly loaded */ + if (item->icon) { 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); + imlib_context_set_image(item->icon); + imlib_free_image(); } } } @@ -1067,38 +1003,53 @@ getitem(struct Menu *menu, int y) static struct Item * itemcycle(struct Menu *currmenu, int direction) { - struct Item *item; + struct Item *item = NULL; struct Item *lastitem; - item = NULL; + for (lastitem = currmenu->list; lastitem && lastitem->next; lastitem = lastitem->next) + ; - if (direction == ITEMNEXT) { + /* select item (either separator or labeled item) in given direction */ + switch (direction) { + case ITEMNEXT: if (currmenu->selected == NULL) item = currmenu->list; else if (currmenu->selected->next != NULL) item = currmenu->selected->next; - - while (item != NULL && item->label == NULL) - item = item->next; - - if (item == NULL) - item = currmenu->list; - } else { - for (lastitem = currmenu->list; - lastitem != NULL && lastitem->next != NULL; - lastitem = lastitem->next) - ; - + break; + case ITEMPREV: if (currmenu->selected == NULL) item = lastitem; else if (currmenu->selected->prev != NULL) item = currmenu->selected->prev; + break; + case ITEMFIRST: + item = currmenu->list; + break; + case ITEMLAST: + item = lastitem; + break; + } + /* + * the selected item can be a separator + * let's select the closest labeled item (ie., one that isn't a separator) + */ + switch (direction) { + case ITEMNEXT: + case ITEMFIRST: + while (item != NULL && item->label == NULL) + item = item->next; + if (item == NULL) + item = currmenu->list; + break; + case ITEMPREV: + case ITEMLAST: while (item != NULL && item->label == NULL) item = item->prev; - if (item == NULL) item = lastitem; + break; } return item; @@ -1111,6 +1062,7 @@ run(struct Menu *currmenu) struct Menu *menu; struct Item *item; struct Item *previtem = NULL; + struct Item *lastitem; KeySym ksym; XEvent ev; @@ -1174,15 +1126,26 @@ selectitem: /* cycle through menu */ item = NULL; - if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) { + if (ksym == XK_Home || ksym == KSYMFIRST) { + item = itemcycle(currmenu, ITEMFIRST); + } else if (ksym == XK_End || ksym == KSYMLAST) { + item = itemcycle(currmenu, ITEMLAST); + } else if (ksym == XK_ISO_Left_Tab || ksym == XK_Up || ksym == KSYMUP) { item = itemcycle(currmenu, ITEMPREV); - } else if (ksym == XK_Tab || ksym == XK_Down) { + } else if (ksym == XK_Tab || ksym == XK_Down || ksym == KSYMDOWN) { item = itemcycle(currmenu, ITEMNEXT); - } else if ((ksym == XK_Return || ksym == XK_Right) && - currmenu->selected != NULL) { + } else if (ksym >= XK_1 && ksym <= XK_9){ + item = itemcycle(currmenu, ITEMFIRST); + lastitem = itemcycle(currmenu, ITEMLAST); + for (int i = ksym - XK_1; i > 0 && item != lastitem; i--) { + currmenu->selected = item; + item = itemcycle(currmenu, ITEMNEXT); + } + } else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) && + currmenu->selected != NULL) { item = currmenu->selected; goto selectitem; - } else if ((ksym == XK_Escape || ksym == XK_Left) && + } else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) && currmenu->parent != NULL) { item = currmenu->parent->selected; currmenu = currmenu->parent; @@ -1238,13 +1201,6 @@ cleanmenu(struct Menu *menu) 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); } @@ -1276,10 +1232,86 @@ cleanup(void) XCloseDisplay(dpy); } -/* show usage */ -static void -usage(void) +/* xmenu: generate menu from stdin and print selected entry to stdout */ +int +main(int argc, char *argv[]) { - (void)fprintf(stderr, "usage: xmenu [-fiw] [-p position] [title]\n"); - exit(1); + struct Menu *rootmenu; + XClassHint classh; + int ch; + + 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; + } + } + argc -= optind; + argv += optind; + + if (argc > 1) + usage(); + + /* open connection to server and set X variables */ + if ((dpy = XOpenDisplay(NULL)) == NULL) + errx(1, "could not open display"); + screen = DefaultScreen(dpy); + visual = DefaultVisual(dpy, screen); + rootwin = RootWindow(dpy, screen); + colormap = DefaultColormap(dpy, screen); + + /* 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 */ + 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"); + setupmenu(rootmenu, &classh); + + /* grab mouse and keyboard */ + if (!wflag) { + grabpointer(); + grabkeyboard(); + } + + /* run event loop */ + run(rootmenu); + + /* freeing stuff */ + cleanmenu(rootmenu); + cleanup(); + + return 0; }