X-Git-Url: http://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/f8d55995dffb94166a38f510ea47bb0218e7bfbf..c4d552d669f23dbc842f3582b0b429a560addcc3:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 6e189cc..9b3a250 100644 --- a/xmenu.c +++ b/xmenu.c @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -17,87 +18,24 @@ #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; static Visual *visual; static Window rootwin; static Colormap colormap; +static XrmDatabase xdb; +static char *xrm; static struct DC dc; static struct Monitor mon; static Atom utf8string; static Atom wmdelete; static Atom netatom[NetLast]; +static XIM xim; /* flags */ -static int fflag = 0; /* whether glyphs should align based on the first font */ static int iflag = 0; /* whether to disable icons */ +static int rflag = 0; /* whether to disable right-click */ 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 */ @@ -105,96 +43,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 [-irw] [-p position] [title]\n"); + exit(1); } /* parse position string from -p, @@ -237,7 +91,86 @@ error: errx(1, "improper position: %s", optarg); } -/* parse color string */ +/* get configuration from X resources */ +static void +getresources(void) +{ + char *type; + XrmValue xval; + + if (xrm == NULL || xdb == NULL) + return; + + if (XrmGetResource(xdb, "xmenu.borderWidth", "*", &type, &xval) == True) + GETNUM(config.border_pixels, xval.addr) + if (XrmGetResource(xdb, "xmenu.separatorWidth", "*", &type, &xval) == True) + GETNUM(config.separator_pixels, xval.addr) + if (XrmGetResource(xdb, "xmenu.height", "*", &type, &xval) == True) + GETNUM(config.height_pixels, xval.addr) + if (XrmGetResource(xdb, "xmenu.width", "*", &type, &xval) == True) + GETNUM(config.width_pixels, xval.addr) + if (XrmGetResource(xdb, "xmenu.gap", "*", &type, &xval) == True) + GETNUM(config.gap_pixels, xval.addr) + if (XrmGetResource(xdb, "xmenu.background", "*", &type, &xval) == True) + config.background_color = xval.addr; + if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True) + config.foreground_color = xval.addr; + if (XrmGetResource(xdb, "xmenu.selbackground", "*", &type, &xval) == True) + config.selbackground_color = xval.addr; + if (XrmGetResource(xdb, "xmenu.selforeground", "*", &type, &xval) == True) + config.selforeground_color = xval.addr; + if (XrmGetResource(xdb, "xmenu.separator", "*", &type, &xval) == True) + config.separator_color = xval.addr; + if (XrmGetResource(xdb, "xmenu.border", "*", &type, &xval) == True) + config.border_color = xval.addr; + if (XrmGetResource(xdb, "xmenu.font", "*", &type, &xval) == True) + config.font = xval.addr; + if (XrmGetResource(xdb, "xmenu.alignment", "*", &type, &xval) == True) { + if (strcasecmp(xval.addr, "center") == 0) + config.alignment = CenterAlignment; + else if (strcasecmp(xval.addr, "left") == 0) + config.alignment = LeftAlignment; + else if (strcasecmp(xval.addr, "right") == 0) + config.alignment = RightAlignment; + } +} + +/* get configuration from command-line options */ +static char * +getoptions(int argc, char *argv[]) +{ + int ch; + + while ((ch = getopt(argc, argv, "ip:rw")) != -1) { + switch (ch) { + case 'i': + iflag = 1; + break; + case 'p': + pflag = 1; + parseposition(optarg); + break; + case 'r': + rflag = 1; + break; + case 'w': + wflag = 1; + break; + default: + usage(); + break; + } + } + argc -= optind; + argv += optind; + if (argc > 1) + usage(); + else if (argc == 1) + return *argv; + return PROGNAME; +} + +/* parse font string */ static void parsefonts(const char *s) { @@ -260,14 +193,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 +213,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 +237,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 +253,8 @@ initmonitor(void) mon.y = info[selmon].y_org; mon.w = info[selmon].width; mon.h = info[selmon].height; + + XFree(info); } if (!pflag) { @@ -327,55 +266,6 @@ initmonitor(void) } } -/* 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 initdc(void) @@ -484,6 +374,11 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) CWBorderPixel | CWEventMask | CWSaveUnder, &swa); + menu->xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, + XNClientWindow, menu->win, XNFocusWindow, menu->win, NULL); + if (menu->xic == NULL) + errx(1, "XCreateIC: could not obtain input method"); + return menu; } @@ -514,7 +409,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) @@ -537,6 +432,10 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file) for (item = prevmenu->list; item->next != NULL; item = item->next) ; + /* a separator is no valid root for a submenu */ + if (!item->label) + errx(1, "a separator is no valid root for a submenu"); + prevmenu = menu; menu->caller = item; item->submenu = menu; @@ -643,12 +542,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 +592,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 +601,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; } @@ -694,29 +626,26 @@ static void setupitems(struct Menu *menu) { struct Item *item; + int itemwidth; menu->w = config.width_pixels; + menu->maxtextw = 0; 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 */ item->h = config.separator_pixels; else item->h = config.height_pixels; menu->h += item->h; - if (item->label) - textwidth = drawtext(NULL, NULL, 0, 0, 0, item->label); + item->textw = drawtext(NULL, NULL, 0, 0, 0, item->label); else - textwidth = 0; + item->textw = 0; /* * set menu width * - * the item width depends on the size of its label (textwidth), + * the item width depends on the size of its label (item->textw), * and it is only used to calculate the width of the menu (which * is equal to the width of the largest item). * @@ -725,9 +654,10 @@ setupitems(struct Menu *menu) * 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 = item->textw + config.triangle_width + config.horzpadding * 3; itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding; menu->w = MAX(menu->w, itemwidth); + menu->maxtextw = MAX(menu->maxtextw, item->textw); } } @@ -740,12 +670,12 @@ setupmenupos(struct Menu *menu) 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 (pflag || (config.posx > mon.x && mon.x + mon.w - config.posx >= width)) + 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)) + 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; @@ -791,8 +721,10 @@ setupmenu(struct Menu *menu, XClassHint *classh) /* set window title (used if wflag is on) */ if (menu->parent == NULL) { title = classh->res_name; - } else { + } else if (menu->caller->output) { title = menu->caller->output; + } else { + title = "\0"; } XStringListToTextProperty(&title, 1, &wintitle); @@ -831,7 +763,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 +779,33 @@ grabkeyboard(void) return; nanosleep(&ts, NULL); } - errx(1, "cannot grab keyboard"); + errx(1, "could not grab keyboard"); +} + +/* try to grab focus, we may have to wait for another process to ungrab */ +static void +grabfocus(Window win) +{ + struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000 }; + Window focuswin; + int i, revertwin; + + for (i = 0; i < 100; ++i) { + XGetInputFocus(dpy, &focuswin, &revertwin); + if (focuswin == win) + return; + XSetInputFocus(dpy, win, RevertToParent, CurrentTime); + nanosleep(&ts, NULL); + } + errx(1, "cannot grab focus"); +} + +/* ungrab pointer and keyboard */ +static void +ungrab(void) +{ + XUngrabPointer(dpy, CurrentTime); + XUngrabKeyboard(dpy, CurrentTime); } /* load and scale icon */ @@ -855,13 +813,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); @@ -880,12 +880,12 @@ loadicon(const char *file) static void drawitems(struct Menu *menu) { + XftDraw *dsel, *dunsel; struct Item *item; + int textx; + int x, y; 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)); @@ -900,21 +900,30 @@ drawitems(struct Menu *menu) 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; + textx = config.horzpadding; + textx += (iflag || !menu->hasicon) ? 0 : config.horzpadding + config.iconsize; + switch (config.alignment) { + case CenterAlignment: + textx += (menu->maxtextw - item->textw) / 2; + break; + case RightAlignment: + textx += menu->maxtextw - item->textw; + break; + default: + break; + } 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); + drawtext(dsel, &dc.selected[ColorFG], textx, 0, item->h, item->label); XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); - drawtext(dunsel, &dc.normal[ColorFG], x, 0, item->h, item->label); + drawtext(dunsel, &dc.normal[ColorFG], textx, 0, item->h, item->label); XftDrawDestroy(dsel); XftDrawDestroy(dunsel); @@ -938,15 +947,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(); } } } @@ -1032,6 +1047,7 @@ mapmenu(struct Menu *currmenu) } prevmenu = currmenu; + grabfocus(currmenu->win); } /* get menu of given window */ @@ -1067,94 +1083,250 @@ 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; } +/* check if button is used to scroll */ +static int +isscrollbutton(unsigned int button) +{ + if (button == Button4 || button == Button5) + return 1; + return 0; +} + +/* check if button is used to open a item on click */ +static int +isclickbutton(unsigned int button) +{ + if (button == Button1 || button == Button2) + return 1; + if (!rflag && button == Button3) + return 1; + return 0; +} + +/* warp pointer to center of selected item */ +static void +warppointer(struct Menu *menu, struct Item *item) +{ + if (menu == NULL || item == NULL) + return; + if (menu->selected) { + XWarpPointer(dpy, None, menu->win, 0, 0, 0, 0, menu->w / 2, item->y + item->h / 2); + } +} + +/* append buf into text */ +static int +append(char *text, char *buf, size_t textsize, size_t buflen) +{ + size_t textlen; + + textlen = strlen(text); + if (iscntrl(*buf)) + return 0; + if (textlen + buflen > textsize - 1) + return 0; + if (buflen < 1) + return 0; + memcpy(text + textlen, buf, buflen); + text[textlen + buflen] = '\0'; + return 1; +} + +/* get item in menu matching text from given direction (or from beginning, if dir = 0) */ +static struct Item * +matchitem(struct Menu *menu, char *text, int dir) +{ + struct Item *item, *lastitem; + char *s; + size_t textlen; + + for (lastitem = menu->list; lastitem && lastitem->next; lastitem = lastitem->next) + ; + textlen = strlen(text); + if (dir < 0) { + if (menu->selected && menu->selected->prev) + item = menu->selected->prev; + else + item = lastitem; + } else if (dir > 0) { + if (menu->selected && menu->selected->next) + item = menu->selected->next; + else + item = menu->list; + } else { + item = menu->list; + } + /* find next item from selected item */ + for ( ; item; item = (dir < 0) ? item->prev : item->next) + for (s = item->label; s && *s; s++) + if (strncasecmp(s, text, textlen) == 0) + return item; + /* if not found, try to find from the beginning/end of list */ + if (dir > 0) { + for (item = menu->list ; item; item = item->next) { + for (s = item->label; s && *s; s++) { + if (strncasecmp(s, text, textlen) == 0) { + return item; + } + } + } + } else { + for (item = lastitem ; item; item = item->prev) { + for (s = item->label; s && *s; s++) { + if (strncasecmp(s, text, textlen) == 0) { + return item; + } + } + } + } + return NULL; +} + +/* check keysyms defined on config.h */ +static KeySym +normalizeksym(KeySym ksym) +{ + if (ksym == KSYMFIRST) + return XK_Home; + if (ksym == KSYMLAST) + return XK_End; + if (ksym == KSYMUP) + return XK_Up; + if (ksym == KSYMDOWN) + return XK_Down; + if (ksym == KSYMLEFT) + return XK_Left; + if (ksym == KSYMRIGHT) + return XK_Right; + return ksym; +} + /* run event loop */ static void run(struct Menu *currmenu) { + char text[BUFSIZ]; + char buf[32]; struct Menu *menu; struct Item *item; struct Item *previtem = NULL; + struct Item *lastitem, *select; KeySym ksym; + Status status; XEvent ev; + int warped = 0; + int action; + int len; + int i; + text[0] = '\0'; mapmenu(currmenu); - while (!XNextEvent(dpy, &ev)) { + if (XFilterEvent(&ev, None)) + continue; + action = ACTION_NOP; switch(ev.type) { case Expose: if (ev.xexpose.count == 0) - drawmenus(currmenu); + action = ACTION_DRAW; break; case MotionNotify: - 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; + if (!warped) { + menu = getmenu(currmenu, ev.xbutton.window); + item = getitem(menu, ev.xbutton.y); + if (menu == NULL || item == NULL || previtem == item) + break; + previtem = item; + select = menu->selected = item; + if (item->submenu != NULL) { + currmenu = item->submenu; + select = NULL; + } else { + currmenu = menu; + } + action = ACTION_CLEAR | ACTION_SELECT | ACTION_MAP | ACTION_DRAW; } - mapmenu(currmenu); - drawmenus(currmenu); + warped = 0; break; case ButtonRelease: - 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; + if (isscrollbutton(ev.xbutton.button)) { + if (ev.xbutton.button == Button4) + select = itemcycle(currmenu, ITEMPREV); + else + select = itemcycle(currmenu, ITEMNEXT); + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW | ACTION_WARP; + } else if (isclickbutton(ev.xbutton.button)) { + menu = getmenu(currmenu, ev.xbutton.window); + item = getitem(menu, ev.xbutton.y); + if (menu == NULL || item == NULL) + break; +enteritem: + if (item->label == NULL) + break; /* ignore separators */ + if (item->submenu != NULL) { + currmenu = item->submenu; + } else { + printf("%s\n", item->output); + return; + } + select = currmenu->list; + action = ACTION_CLEAR | ACTION_SELECT | ACTION_MAP | ACTION_DRAW; + if (ev.xbutton.button == Button2) { + action |= ACTION_WARP; + } } - mapmenu(currmenu); - currmenu->selected = currmenu->list; - drawmenus(currmenu); break; case ButtonPress: menu = getmenu(currmenu, ev.xbutton.window); @@ -1162,7 +1334,16 @@ selectitem: return; break; case KeyPress: - ksym = XkbKeycodeToKeysym(dpy, ev.xkey.keycode, 0, 0); + len = XmbLookupString(currmenu->xic, &ev.xkey, buf, sizeof buf, &ksym, &status); + switch(status) { + default: /* XLookupNone, XBufferOverflow */ + continue; + case XLookupChars: + goto append; + case XLookupKeySym: /* FALLTHROUGH */ + case XLookupBoth: + break; + } /* esc closes xmenu when current menu is the root menu */ if (ksym == XK_Escape && currmenu->parent == NULL) @@ -1173,29 +1354,83 @@ selectitem: ksym = XK_ISO_Left_Tab; /* cycle through menu */ - item = NULL; - if (ksym == XK_ISO_Left_Tab || ksym == XK_Up) { - item = itemcycle(currmenu, ITEMPREV); - } else if (ksym == XK_Tab || ksym == XK_Down) { - item = itemcycle(currmenu, ITEMNEXT); - } else if ((ksym == XK_Return || ksym == XK_Right) && - currmenu->selected != NULL) { - item = currmenu->selected; - goto selectitem; - } else if ((ksym == XK_Escape || ksym == XK_Left) && - currmenu->parent != NULL) { - item = currmenu->parent->selected; - currmenu = currmenu->parent; - mapmenu(currmenu); - } else + select = NULL; + ksym = normalizeksym(ksym); + switch (ksym) { + case XK_Home: + select = itemcycle(currmenu, ITEMFIRST); + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; break; - currmenu->selected = item; - drawmenus(currmenu); + case XK_End: + select = itemcycle(currmenu, ITEMLAST); + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; + break; + case XK_ISO_Left_Tab: + if (*text) { + select = matchitem(currmenu, text, -1); + action = ACTION_SELECT | ACTION_DRAW; + break; + } + /* FALLTHROUGH */ + case XK_Up: + select = itemcycle(currmenu, ITEMPREV); + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; + break; + case XK_Tab: + if (*text) { + select = matchitem(currmenu, text, 1); + action = ACTION_SELECT | ACTION_DRAW; + break; + } + /* FALLTHROUGH */ + case XK_Down: + select = itemcycle(currmenu, ITEMNEXT); + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; + break; + case XK_1: case XK_2: case XK_3: case XK_4: case XK_5: case XK_6: case XK_7: case XK_8: case 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); + } + select = item; + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; + break; + case XK_Return: case XK_Right: + if (currmenu->selected) { + item = currmenu->selected; + goto enteritem; + } + break; + case XK_Escape: case XK_Left: + if (currmenu->parent) { + select = currmenu->parent->selected; + currmenu = currmenu->parent; + action = ACTION_CLEAR | ACTION_MAP | ACTION_SELECT | ACTION_DRAW; + } + break; + case XK_BackSpace: case XK_Clear: case XK_Delete: + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; + break; + default: +append: + if (*buf == '\0' || iscntrl(*buf)) + break; + for (i = 0; i < 2; i++) { + append(text, buf, sizeof text, len); + if ((select = matchitem(currmenu, text, 0))) + break; + text[0] = '\0'; + } + action = ACTION_SELECT | ACTION_DRAW; + break; + } break; case LeaveNotify: previtem = NULL; - currmenu->selected = NULL; - drawmenus(currmenu); + select = NULL; + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; break; case ConfigureNotify: menu = getmenu(currmenu, ev.xconfigure.window); @@ -1212,9 +1447,21 @@ selectitem: if (menu->parent == NULL) return; /* closing the root menu closes the program */ currmenu = menu->parent; - mapmenu(currmenu); + action = ACTION_MAP; break; } + if (action & ACTION_CLEAR) + text[0] = '\0'; + if (action & ACTION_SELECT) + currmenu->selected = select; + if (action & ACTION_MAP) + mapmenu(currmenu); + if (action & ACTION_DRAW) + drawmenus(currmenu); + if (action & ACTION_WARP) { + warppointer(currmenu, select); + warped = 1; + } } } @@ -1238,13 +1485,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); } @@ -1253,33 +1493,86 @@ cleanmenu(struct Menu *menu) free(menu); } -/* cleanup X and exit */ +/* cleanup draw context */ static void -cleanup(void) +cleandc(void) { 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.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); } -/* 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; + + /* open connection to server and set X variables */ + if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + warnx("warning: no locale support"); + 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); + XrmInitialize(); + if ((xrm = XResourceManagerString(dpy)) != NULL) + xdb = XrmGetStringDatabase(xrm); + if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL) + errx(1, "XOpenIM: could not open input device"); + + /* process configuration and window class */ + getresources(); + classh.res_class = PROGNAME; + classh.res_name = getoptions(argc, argv); + + /* 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(); + initdc(); + initiconsize(); + initatoms(); + + /* 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); + + /* clean stuff */ + ungrab(); + cleanmenu(rootmenu); + cleandc(); + XrmDestroyDatabase(xdb); + XCloseDisplay(dpy); + + return 0; }