X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/b33886d7a213473ca83262488b4b29861f34d42b..HEAD:/xmenu.c diff --git a/xmenu.c b/xmenu.c index 90e7906..177cf9c 100644 --- a/xmenu.c +++ b/xmenu.c @@ -16,29 +16,156 @@ #include #include #include -#include "xmenu.h" + +/* macros */ +#define MAXPATHS 128 /* maximal number of paths to look for icons */ +#define ICONPATH "ICONPATH" /* environment variable name */ +#define CLASS "XMenu" +#define LEN(x) (sizeof (x) / sizeof (x[0])) +#define BETWEEN(x, a, b) ((a) <= (x) && (x) <= (b)) +#define GETNUM(n, s) { \ + unsigned long __TMP__; \ + if ((__TMP__ = strtoul((s), NULL, 10)) < INT_MAX) \ + (n) = __TMP__; \ + } + +/* Actions for the main loop */ +enum { + ACTION_NOP = 0, + ACTION_CLEAR = 1<<0, /* clear text */ + ACTION_SELECT = 1<<1, /* select item */ + ACTION_MAP = 1<<2, /* remap menu windows */ + ACTION_DRAW = 1<<3, /* redraw menu windows */ + ACTION_WARP = 1<<4, /* warp the pointer */ +}; + +/* enum for keyboard menu navigation */ +enum { ITEMPREV, ITEMNEXT, ITEMFIRST, ITEMLAST }; + +/* enum for text alignment */ +enum {LeftAlignment, CenterAlignment, RightAlignment}; + +/* color enum */ +enum {ColorFG, ColorBG, ColorLast}; + +/* EWMH atoms */ +enum {NetWMName, NetWMWindowType, NetWMWindowTypePopupMenu, NetLast}; + +/* configuration structure */ +struct Config { + /* the values below are set by config.h */ + const char *font; + const char *background_color; + const char *foreground_color; + const char *selbackground_color; + const char *selforeground_color; + const char *separator_color; + const char *border_color; + int width_pixels; + int height_pixels; + int border_pixels; + int max_items; + int separator_pixels; + int gap_pixels; + int triangle_width; + int triangle_height; + int iconpadding; + int horzpadding; + int alignment; + + /* the values below are set by options */ + int monitor; + int posx, posy; /* rootmenu position */ + + /* the value below is computed by xmenu */ + int iconsize; +}; + +/* draw context structure */ +struct DC { + XftColor normal[ColorLast]; + XftColor selected[ColorLast]; + XftColor border; + XftColor separator; + + GC gc; + + FcPattern *pattern; + XftFont **fonts; + size_t nfonts; +}; + +/* menu item structure */ +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 */ + int textw; /* text width */ + struct Item *prev; /* previous item */ + struct Item *next; /* next item */ + struct Menu *submenu; /* submenu spawned by clicking on item */ + Drawable sel, unsel; /* pixmap for selected and unselected item */ + Imlib_Image icon; +}; + +/* monitor geometry structure */ +struct Monitor { + int x, y, w, h; /* monitor geometry */ +}; + +/* 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 *first; /* first item displayed on the menu */ + struct Item *selected; /* item currently selected in the menu */ + int x, y, w, h; /* menu geometry */ + int hasicon; /* whether the menu has item with icons */ + int drawn; /* whether the menu was already drawn */ + int maxtextw; /* maximum text width */ + int level; /* menu level relative to root */ + int overflow; /* whether the menu is higher than the monitor */ + Window win; /* menu window to map on the screen */ + XIC xic; /* input context */ +}; /* X stuff */ static Display *dpy; -static int screen; static Visual *visual; static Window rootwin; static Colormap colormap; static XrmDatabase xdb; +static XClassHint classh; static char *xrm; static struct DC dc; -static struct Monitor mon; static Atom utf8string; static Atom wmdelete; static Atom netatom[NetLast]; +static int screen; +static int depth; static XIM xim; /* flags */ -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 */ +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 */ +static int rootmodeflag = 0; /* wheter to run in root mode */ +static int passclickflag = 0; /* whether to pass click to root window */ +static int firsttime = 1; /* set to 0 after first run */ + +/* arguments */ +static unsigned int button = 0; /* button to trigger pmenu in root mode */ +static unsigned int modifier = 0; /* modifier to trigger pmenu */ + +/* icons paths */ +static char *iconstring = NULL; /* string read from getenv */ +static char *iconpaths[MAXPATHS]; /* paths to icon directories */ +static int niconpaths = 0; /* number of paths to icon directories */ /* include config variable */ #include "config.h" @@ -47,12 +174,48 @@ static int wflag = 0; /* whether to let the window manager control XMenu */ static void usage(void) { - (void)fprintf(stderr, "usage: xmenu [-irw] [-p position] [title]\n"); + + (void)fprintf(stderr, "usage: xmenu [-irw] [-p position] [(-x|-X) [modifier-]button] [title]\n"); exit(1); } -/* parse position string from -p, - * put results on config.posx, config.posy, and config.monitor */ +/* maximum int */ +static int +max(int x, int y) +{ + return x > y ? x : y; +} + +/* minimum int */ +static int +min(int x, int y) +{ + return x < y ? x : y; +} + +/* call malloc checking for error */ +static void * +emalloc(size_t size) +{ + void *p; + + if ((p = malloc(size)) == NULL) + err(1, "malloc"); + return p; +} + +/* call strdup checking for error */ +static char * +estrdup(const char *s) +{ + char *t; + + if ((t = strdup(s)) == NULL) + err(1, "strdup"); + return t; +} + +/* parse position string from -p, put results on config.posx, config.posy, and config.monitor */ static void parseposition(char *optarg) { @@ -111,6 +274,8 @@ getresources(void) GETNUM(config.width_pixels, xval.addr) if (XrmGetResource(xdb, "xmenu.gap", "*", &type, &xval) == True) GETNUM(config.gap_pixels, xval.addr) + if (XrmGetResource(xdb, "xmenu.maxItems", "*", &type, &xval) == True) + GETNUM(config.max_items, xval.addr) if (XrmGetResource(xdb, "xmenu.background", "*", &type, &xval) == True) config.background_color = xval.addr; if (XrmGetResource(xdb, "xmenu.foreground", "*", &type, &xval) == True) @@ -135,13 +300,75 @@ getresources(void) } } +/* set button global variable */ +static void +setbutton(char *s) +{ + size_t len; + + if ((len = strlen(s)) < 1) + return; + switch (s[len-1]) { + case '1': button = Button1; break; + case '2': button = Button2; break; + case '3': button = Button3; break; + default: button = atoi(&s[len-1]); break; + } +} + +/* set modifier global variable */ +static void +setmodifier(char *s) +{ + size_t len; + + if ((len = strlen(s)) < 1) + return; + switch (s[len-1]) { + case '1': modifier = Mod1Mask; break; + case '2': modifier = Mod2Mask; break; + case '3': modifier = Mod3Mask; break; + case '4': modifier = Mod4Mask; break; + case '5': modifier = Mod5Mask; break; + default: + if (strcasecmp(s, "Alt") == 0) { + modifier = Mod1Mask; + } else if (strcasecmp(s, "Super") == 0) { + modifier = Mod4Mask; + } + break; + } +} + +/* parse icon path string */ +static void +parseiconpaths(char *s) +{ + if (s == NULL) + return; + free(iconstring); + iconstring = estrdup(s); + niconpaths = 0; + for (s = strtok(iconstring, ":"); s != NULL; s = strtok(NULL, ":")) { + if (niconpaths < MAXPATHS) { + iconpaths[niconpaths++] = s; + } + } +} + /* get configuration from command-line options */ -static char * +static void getoptions(int argc, char *argv[]) { int ch; - - while ((ch = getopt(argc, argv, "ip:rw")) != -1) { + char *s, *t; + + classh.res_class = CLASS; + classh.res_name = argv[0]; + if ((s = strrchr(argv[0], '/')) != NULL) + classh.res_name = s + 1; + parseiconpaths(getenv(ICONPATH)); + while ((ch = getopt(argc, argv, "ip:rwx:X:")) != -1) { switch (ch) { case 'i': iflag = 1; @@ -156,18 +383,30 @@ getoptions(int argc, char *argv[]) case 'w': wflag = 1; break; + case 'X': + passclickflag = 1; + /* PASSTHROUGH */ + case 'x': + rootmodeflag = 1; + s = optarg; + setbutton(s); + if ((t = strchr(s, '-')) == NULL) + return; + *t = '\0'; + setmodifier(s); + break; default: usage(); break; } } + if (rootmodeflag) + wflag = 0; argc -= optind; argv += optind; - if (argc > 1) + if (argc != 0) usage(); - else if (argc == 1) - return *argv; - return PROGNAME; + return; } /* parse font string */ @@ -218,7 +457,7 @@ ealloccolor(const char *s, XftColor *color) /* query monitor information and cursor position */ static void -initmonitor(void) +getmonitor(struct Monitor *mon) { XineramaScreenInfo *info = NULL; Window dw; /* dummy variable */ @@ -230,9 +469,9 @@ initmonitor(void) XQueryPointer(dpy, rootwin, &dw, &dw, &cursx, &cursy, &di, &di, &du); - mon.x = mon.y = 0; - mon.w = DisplayWidth(dpy, screen); - mon.h = DisplayHeight(dpy, screen); + mon->x = mon->y = 0; + mon->w = DisplayWidth(dpy, screen); + mon->h = DisplayHeight(dpy, screen); if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) { int selmon = 0; @@ -249,10 +488,10 @@ initmonitor(void) selmon = config.monitor; } - mon.x = info[selmon].x_org; - mon.y = info[selmon].y_org; - mon.w = info[selmon].width; - mon.h = info[selmon].height; + mon->x = info[selmon].x_org; + mon->y = info[selmon].y_org; + mon->w = info[selmon].width; + mon->h = info[selmon].height; XFree(info); } @@ -261,8 +500,8 @@ initmonitor(void) config.posx = cursx; config.posy = cursy; } else if (mflag) { - config.posx += mon.x; - config.posy += mon.y; + config.posx += mon->x; + config.posy += mon->y; } } @@ -309,26 +548,22 @@ allocitem(const char *label, const char *output, char *file) { struct Item *item; - if ((item = malloc(sizeof *item)) == NULL) - err(1, "malloc"); + item = emalloc(sizeof *item); if (label == NULL) { item->label = NULL; item->output = NULL; } else { - if ((item->label = strdup(label)) == NULL) - err(1, "strdup"); + item->label = estrdup(label); if (label == output) { item->output = item->label; } else { - if ((item->output = strdup(output)) == NULL) - err(1, "strdup"); + item->output = estrdup(output); } } if (file == NULL) { item->file = NULL; } else { - if ((item->file = strdup(file)) == NULL) - err(1, "strdup"); + item->file = estrdup(file); } item->y = 0; item->h = 0; @@ -341,24 +576,18 @@ allocitem(const char *label, const char *output, char *file) /* allocate a menu and create its window */ static struct Menu * -allocmenu(struct Menu *parent, struct Item *list, unsigned level) +allocmenu(struct Menu *parent, struct Item *list, int level) { XSetWindowAttributes swa; struct Menu *menu; - if ((menu = malloc(sizeof *menu)) == NULL) - err(1, "malloc"); - menu->parent = parent; - menu->list = list; - menu->caller = NULL; - menu->selected = NULL; - menu->w = 0; /* recalculated by setupmenu() */ - menu->h = 0; /* recalculated by setupmenu() */ - menu->x = mon.x; /* recalculated by setupmenu() */ - menu->y = mon.y; /* recalculated by setupmenu() */ - menu->level = level; - menu->drawn = 0; - menu->hasicon = 0; + menu = emalloc(sizeof *menu); + *menu = (struct Menu){ + .parent = parent, + .list = list, + .level = level, + .first = NULL, + }; swa.override_redirect = (wflag) ? False : True; swa.background_pixel = dc.normal[ColorBG].pixel; @@ -368,7 +597,7 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) | PointerMotionMask | LeaveWindowMask; if (wflag) swa.event_mask |= StructureNotifyMask; - menu->win = XCreateWindow(dpy, rootwin, 0, 0, 1, 1, 0, + menu->win = XCreateWindow(dpy, rootwin, 0, 0, 1, 1, config.border_pixels, CopyFromParent, CopyFromParent, CopyFromParent, CWOverrideRedirect | CWBackPixel | CWBorderPixel | CWEventMask | CWSaveUnder, @@ -384,14 +613,14 @@ 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, char *file) +buildmenutree(int 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 */ struct Item *curritem = NULL; /* item currently being read */ struct Item *item; /* dummy item for loops */ struct Menu *menu; /* dummy menu for loops */ - unsigned i; + int i; /* create the item */ curritem = allocitem(label, output, file); @@ -432,6 +661,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; @@ -451,7 +684,7 @@ parsestdin(void) struct Menu *rootmenu; char *s, buf[BUFSIZ]; char *file, *label, *output; - unsigned level = 0; + int level = 0; rootmenu = NULL; @@ -619,20 +852,34 @@ drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *t /* setup the height, width and icon of the items of a menu */ static void -setupitems(struct Menu *menu) +setupitems(struct Menu *menu, struct Monitor *mon) { + Pixmap pix; struct Item *item; int itemwidth; + int menuh; + int maxh; + menu->first = menu->list; menu->w = config.width_pixels; menu->maxtextw = 0; + menuh = 0; + maxh = config.max_items > 3 ? (2 + config.max_items) * config.height_pixels : mon->h; for (item = menu->list; item != NULL; item = item->next) { - item->y = menu->h; + item->y = menuh; if (item->label == NULL) /* height for separator item */ item->h = config.separator_pixels; else item->h = config.height_pixels; - menu->h += item->h; + menuh += item->h; + if (!menu->overflow) { + if (menu->h + config.height_pixels * 2 < maxh - config.border_pixels * 2) { + menu->h = menuh; + } else { + menu->overflow = 1; + menu->h += config.height_pixels * 2; + } + } if (item->label) item->textw = drawtext(NULL, NULL, 0, 0, 0, item->label); else @@ -652,49 +899,79 @@ setupitems(struct Menu *menu) */ 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); + menu->w = max(menu->w, itemwidth); + menu->maxtextw = max(menu->maxtextw, item->textw); + } + if (!menu->overflow) { + XSetWindowBackground(dpy, menu->win, dc.normal[ColorBG].pixel); + } else { + pix = XCreatePixmap(dpy, menu->win, menu->w, menu->h, depth); + XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel); + XFillRectangle(dpy, pix, dc.gc, 0, 0, menu->w, menu->h); + XSetForeground(dpy, dc.gc, dc.normal[ColorFG].pixel); + XFillPolygon( + dpy, pix, dc.gc, + (XPoint []){ + {menu->w / 2 - 3, config.height_pixels / 2 + 2}, + {3, -4}, + {3, 4}, + {-6, 0}, + }, + 4, Convex, CoordModePrevious + ); + XFillPolygon( + dpy, pix, dc.gc, + (XPoint []){ + {menu->w / 2 - 3, menu->h - config.height_pixels / 2 - 2}, + {3, 4}, + {3, -4}, + {-6, 0}, + }, + 4, Convex, CoordModePrevious + ); + XSetWindowBackgroundPixmap(dpy, menu->win, pix); + XFreePixmap(dpy, pix); } } /* setup the position of a menu */ static void -setupmenupos(struct Menu *menu) +setupmenupos(struct Menu *menu, struct Monitor *mon) { int width, height; 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; + else if (mon->y + mon->h > height) + menu->y = mon->y + mon->h - height; } else { /* else, calculate in respect to parent menu */ int parentwidth; parentwidth = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels; - if (mon.x + mon.w - parentwidth >= width) + if (mon->x + mon->w - parentwidth >= width) menu->x = parentwidth; 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 (mon.y + mon.h - (menu->caller->y + menu->parent->y) >= height) + if (mon->y + mon->h - (menu->caller->y + menu->parent->y) >= height) menu->y = menu->caller->y + menu->parent->y; - else if (mon.y + mon.h > height) - menu->y = mon.y + mon.h - height; + else if (mon->y + mon->h > height) + menu->y = mon->y + mon->h - height; } } /* recursivelly setup menu configuration and its pixmap */ static void -setupmenu(struct Menu *menu, XClassHint *classh) +setupmenu(struct Menu *menu, struct Monitor *mon) { char *title; struct Item *item; @@ -703,43 +980,46 @@ setupmenu(struct Menu *menu, XClassHint *classh) XTextProperty wintitle; /* setup size and position of menus */ - setupitems(menu); - setupmenupos(menu); + setupitems(menu, mon); + setupmenupos(menu, mon); /* update menu geometry */ - 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; + XConfigureWindow(dpy, menu->win, CWWidth | CWHeight | CWX | CWY, &changes); + + if (firsttime) { + /* set window title (used if wflag is on) */ + if (menu->parent == NULL) { + title = classh.res_name; + } else if (menu->caller->output) { + title = menu->caller->output; + } else { + title = "\0"; + } + XStringListToTextProperty(&title, 1, &wintitle); + + /* set window manager hints */ + sizeh.flags = USPosition | PMaxSize | PMinSize; + sizeh.min_width = sizeh.max_width = menu->w; + sizeh.min_height = sizeh.max_height = menu->h; + XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, &classh); + + /* 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); } - XStringListToTextProperty(&title, 1, &wintitle); - - /* set window manager hints */ - sizeh.flags = USPosition | PMaxSize | PMinSize; - sizeh.min_width = sizeh.max_width = menu->w; - sizeh.min_height = sizeh.max_height = menu->h; - XSetWMProperties(dpy, menu->win, &wintitle, NULL, NULL, 0, &sizeh, NULL, classh); - - /* 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(item->submenu, classh); + setupmenu(item->submenu, mon); } } @@ -802,22 +1082,42 @@ ungrab(void) XUngrabKeyboard(dpy, CurrentTime); } +/* check if path is absolute or relative to current directory */ +static int +isabsolute(const char *s) +{ + return s[0] == '/' || (s[0] == '.' && (s[1] == '/' || (s[1] == '.' && s[2] == '/'))); +} + /* load and scale icon */ static Imlib_Image loadicon(const char *file) { Imlib_Image icon; Imlib_Load_Error errcode; + char path[PATH_MAX]; const char *errstr; int width; int height; int imgsize; + int i; - 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) { + } + if (isabsolute(file)) + icon = imlib_load_image_with_error_return(file, &errcode); + else { + for (i = 0; i < niconpaths; i++) { + snprintf(path, sizeof(path), "%s/%s", iconpaths[i], file); + icon = imlib_load_image_with_error_return(path, &errcode); + if (icon != NULL || errcode != IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST) { + break; + } + } + } + if (icon == NULL) { switch (errcode) { case IMLIB_LOAD_ERROR_FILE_DOES_NOT_EXIST: errstr = "file does not exist"; @@ -861,7 +1161,7 @@ loadicon(const char *file) width = imlib_image_get_width(); height = imlib_image_get_height(); - imgsize = MIN(width, height); + imgsize = min(width, height); icon = imlib_create_cropped_scaled_image(0, 0, imgsize, imgsize, config.iconsize, @@ -880,22 +1180,20 @@ drawitems(struct Menu *menu) int x, y; for (item = menu->list; item != NULL; item = item->next) { - item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h, - DefaultDepth(dpy, screen)); + item->unsel = XCreatePixmap(dpy, menu->win, menu->w, item->h, depth); XSetForeground(dpy, dc.gc, dc.normal[ColorBG].pixel); XFillRectangle(dpy, item->unsel, dc.gc, 0, 0, menu->w, item->h); if (item->label == NULL) { /* item is separator */ - y = item->h/2; + y = item->h / 2; XSetForeground(dpy, dc.gc, dc.separator.pixel); XDrawLine(dpy, item->unsel, dc.gc, config.horzpadding, y, menu->w - config.horzpadding, y); item->sel = item->unsel; } else { - item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h, - DefaultDepth(dpy, screen)); + item->sel = XCreatePixmap(dpy, menu->win, menu->w, item->h, depth); XSetForeground(dpy, dc.gc, dc.selected[ColorBG].pixel); XFillRectangle(dpy, item->sel, dc.gc, 0, 0, menu->w, item->h); @@ -967,47 +1265,73 @@ drawmenus(struct Menu *currmenu) { struct Menu *menu; struct Item *item; + int y0, y; + int maxh; for (menu = currmenu; menu != NULL; menu = menu->parent) { if (!menu->drawn) { drawitems(menu); menu->drawn = 1; } - for (item = menu->list; item != NULL; item = item->next) { - if (item == menu->selected) - XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0, - menu->w, item->h, 0, item->y); - else - XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0, - menu->w, item->h, 0, item->y); + if (menu->overflow && menu->selected != NULL) { + maxh = menu->h - config.height_pixels * 2; + while (menu->first->next != NULL && + menu->selected->y >= menu->first->y + maxh) { + menu->first = menu->first->next; + } + while (menu->first->prev != NULL && + menu->selected->y < menu->first->y) { + menu->first = menu->first->prev; + } + } + y = menu->first->y; + y0 = menu->overflow ? config.height_pixels : 0; + for (item = menu->first; item != NULL; item = item->next) { + if (menu->overflow && item->y - y + item->h > menu->h - config.height_pixels * 2) + break; + if (item == menu->selected) { + XCopyArea(dpy, item->sel, menu->win, dc.gc, 0, 0, menu->w, item->h, 0, y0 + item->y - y); + } else { + XCopyArea(dpy, item->unsel, menu->win, dc.gc, 0, 0, menu->w, item->h, 0, y0 + item->y - y); + } } } } -/* umap previous menus and map current menu and its parents */ +/* unmap current menu and its parents */ static void -mapmenu(struct Menu *currmenu) +unmapmenu(struct Menu *currmenu) +{ + struct Menu *menu; + + for (menu = currmenu; menu != NULL; menu = menu->parent) { + menu->selected = NULL; + XUnmapWindow(dpy, menu->win); + } +} + +/* umap previous menus and map current menu and its parents */ +static struct Menu * +mapmenu(struct Menu *currmenu, struct Menu *prevmenu, struct Monitor *mon) { - static struct Menu *prevmenu = NULL; struct Menu *menu, *menu_; struct Menu *lcamenu; /* lowest common ancestor menu */ - unsigned minlevel; /* level of the closest to root menu */ - unsigned maxlevel; /* level of the closest to root menu */ + int minlevel; /* level of the closest to root menu */ + int maxlevel; /* level of the closest to root menu */ /* do not remap current menu if it wasn't updated*/ if (prevmenu == currmenu) - return; + goto done; /* if this is the first time mapping, skip calculations */ if (prevmenu == NULL) { XMapWindow(dpy, currmenu->win); - prevmenu = currmenu; - return; + goto done; } /* find lowest common ancestor menu */ - minlevel = MIN(currmenu->level, prevmenu->level); - maxlevel = MAX(currmenu->level, prevmenu->level); + minlevel = min(currmenu->level, prevmenu->level); + maxlevel = max(currmenu->level, prevmenu->level); if (currmenu->level == maxlevel) { menu = currmenu; menu_ = prevmenu; @@ -1031,17 +1355,16 @@ mapmenu(struct Menu *currmenu) /* map menus from currmenu (inclusive) until lcamenu (exclusive) */ for (menu = currmenu; menu != lcamenu; menu = menu->parent) { - if (wflag) { - setupmenupos(menu); + setupmenupos(menu, mon); XMoveWindow(dpy, menu->win, menu->x, menu->y); } - XMapWindow(dpy, menu->win); } - prevmenu = currmenu; grabfocus(currmenu->win); +done: + return currmenu; } /* get menu of given window */ @@ -1057,20 +1380,40 @@ getmenu(struct Menu *currmenu, Window win) return NULL; } -/* get item of given menu and position */ -static struct Item * -getitem(struct Menu *menu, int y) +/* get in *ret the item in given menu and position; return 1 if position is on a scroll triangle */ +static int +getitem(struct Menu *menu, struct Item **ret, int y) { struct Item *item; + int y0; + *ret = NULL; 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; + return 0; + if (menu->overflow) { + if (y < config.height_pixels) { + *ret = menu->first->prev; + return 1; + } else if (y > menu->h - config.height_pixels) { + y0 = menu->overflow ? config.height_pixels : 0; + y = menu->h - y0 + menu->first->y; + for (item = menu->first; item != NULL; item = item->next) + if (y >= item->y && y <= item->y + item->h) + break; + if (item != NULL) + *ret = menu->first->next; + return 1; + } + } + y0 = menu->overflow ? config.height_pixels : 0; + y -= y0 - menu->first->y; + for (item = menu->first; item != NULL; item = item->next) { + if (y >= item->y && y <= item->y + item->h) { + *ret = item; + break; + } + } + return 0; } /* cycle through the items; non-zero direction is next, zero is prev */ @@ -1129,17 +1472,37 @@ itemcycle(struct Menu *currmenu, int direction) 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) + 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) @@ -1158,40 +1521,95 @@ append(char *text, char *buf, size_t textsize, size_t buflen) return 1; } -/* get item in menu matching text */ +/* get item in menu matching text from given direction (or from beginning, if dir = 0) */ static struct Item * -matchitem(struct Menu *menu, char *text) +matchitem(struct Menu *menu, char *text, int dir) { - struct Item *item; + struct Item *item, *lastitem; char *s; size_t textlen; + for (lastitem = menu->list; lastitem && lastitem->next; lastitem = lastitem->next) + ; textlen = strlen(text); - for (item = menu->list; item; item = item->next) + 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) +run(struct Menu *currmenu, struct Monitor *mon) { char text[BUFSIZ]; char buf[32]; - struct Menu *menu; + struct Menu *menu, *prevmenu; 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); + prevmenu = currmenu; while (!XNextEvent(dpy, &ev)) { if (XFilterEvent(&ev, None)) continue; @@ -1202,43 +1620,61 @@ run(struct Menu *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; - select = menu->selected = item; - if (item->submenu != NULL) { - currmenu = item->submenu; - select = NULL; - } else { - currmenu = menu; + if (!warped) { + menu = getmenu(currmenu, ev.xbutton.window); + if (getitem(menu, &item, ev.xbutton.y)) + break; + 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; } - action = ACTION_SELECT | ACTION_MAP | ACTION_DRAW; + warped = 0; break; case ButtonRelease: - if (!isclickbutton(ev.xbutton.button)) - break; - menu = getmenu(currmenu, ev.xbutton.window); - item = getitem(menu, ev.xbutton.y); - if (menu == NULL || item == NULL) - break; + 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); + if (getitem(menu, &item, ev.xbutton.y) && item != NULL) { + select = NULL; + menu->first = item; + action = ACTION_CLEAR | ACTION_SELECT | ACTION_MAP | ACTION_DRAW; + break; + } + 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; + if (item->label == NULL) + break; /* ignore separators */ + if (item->submenu != NULL) { + currmenu = item->submenu; + } else { + printf("%s\n", item->output); + goto done; + } + select = currmenu->list; + action = ACTION_CLEAR | ACTION_SELECT | ACTION_MAP | ACTION_DRAW; + if (ev.xbutton.button == Button2) { + action |= ACTION_WARP; + } } - select = currmenu->list; - action = ACTION_SELECT | ACTION_MAP | ACTION_DRAW; break; case ButtonPress: menu = getmenu(currmenu, ev.xbutton.window); if (menu == NULL) - return; + goto done; break; case KeyPress: len = XmbLookupString(currmenu->xic, &ev.xkey, buf, sizeof buf, &ksym, &status); @@ -1254,56 +1690,90 @@ enteritem: /* esc closes xmenu when current menu is the root menu */ if (ksym == XK_Escape && currmenu->parent == NULL) - return; + goto done; /* Shift-Tab = ISO_Left_Tab */ if (ksym == XK_Tab && (ev.xkey.state & ShiftMask)) ksym = XK_ISO_Left_Tab; /* cycle through menu */ - item = NULL; - 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 || ksym == KSYMDOWN) { - item = itemcycle(currmenu, ITEMNEXT); - } else if (ksym >= XK_1 && ksym <= XK_9){ + select = NULL; + ksym = normalizeksym(ksym); + switch (ksym) { + case XK_Home: + select = itemcycle(currmenu, ITEMFIRST); + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; + break; + 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); } - } else if ((ksym == XK_Return || ksym == XK_Right || ksym == KSYMRIGHT) && - currmenu->selected != NULL) { - item = currmenu->selected; - goto enteritem; - } else if ((ksym == XK_Escape || ksym == XK_Left || ksym == KSYMLEFT) && - currmenu->parent != NULL) { - item = currmenu->parent->selected; - currmenu = currmenu->parent; - action = ACTION_MAP; - } else { + 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 (append(text, buf, sizeof text, len)) { - currmenu->selected = matchitem(currmenu, text); - action = ACTION_DRAW; - } else { - select = NULL; - action = ACTION_SELECT | ACTION_DRAW; + 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; } - select = item; - action |= ACTION_SELECT | ACTION_DRAW; break; case LeaveNotify: previtem = NULL; select = NULL; - action = ACTION_SELECT | ACTION_DRAW; + action = ACTION_CLEAR | ACTION_SELECT | ACTION_DRAW; break; case ConfigureNotify: menu = getmenu(currmenu, ev.xconfigure.window); @@ -1313,25 +1783,32 @@ append: menu->y = ev.xconfigure.y; break; case ClientMessage: - if ((unsigned long) ev.xclient.data.l[0] != wmdelete) + 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 */ + goto done; /* closing the root menu closes the program */ currmenu = menu->parent; action = ACTION_MAP; break; } - if (action & ACTION_SELECT) { - currmenu->selected = select; + if (action & ACTION_CLEAR) text[0] = '\0'; - } + if (action & ACTION_SELECT) + currmenu->selected = select; if (action & ACTION_MAP) - mapmenu(currmenu); + prevmenu = mapmenu(currmenu, prevmenu, mon); if (action & ACTION_DRAW) drawmenus(currmenu); + if (action & ACTION_WARP) { + warppointer(currmenu, select); + warped = 1; + } } +done: + unmapmenu(currmenu); + ungrab(); } /* recursivelly free pixmaps and destroy windows */ @@ -1383,8 +1860,9 @@ cleandc(void) int main(int argc, char *argv[]) { + struct Monitor mon; struct Menu *rootmenu; - XClassHint classh; + XEvent ev; /* open connection to server and set X variables */ if (!setlocale(LC_CTYPE, "") || !XSupportsLocale()) @@ -1395,16 +1873,16 @@ main(int argc, char *argv[]) visual = DefaultVisual(dpy, screen); rootwin = RootWindow(dpy, screen); colormap = DefaultColormap(dpy, screen); + depth = DefaultDepth(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"); - /* get configuration */ + /* process configuration and window class */ getresources(); - classh.res_class = PROGNAME; - classh.res_name = getoptions(argc, argv); + getoptions(argc, argv); /* imlib2 stuff */ if (!iflag) { @@ -1416,28 +1894,46 @@ main(int argc, char *argv[]) } /* initializers */ - initmonitor(); initdc(); initiconsize(); initatoms(); - /* generate menus and set them up */ + /* if running in root mode, get button presses from root window */ + if (rootmodeflag) + XGrabButton(dpy, button, AnyModifier, rootwin, False, ButtonPressMask, GrabModeSync, GrabModeSync, None, None); + + /* generate menus */ 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); + do { + if (rootmodeflag) + XNextEvent(dpy, &ev); + if (!rootmodeflag || + (ev.type == ButtonPress && + ((modifier != 0 && (ev.xbutton.state & modifier)) || + (ev.xbutton.subwindow == None)))) { + if (rootmodeflag && passclickflag) { + XAllowEvents(dpy, ReplayPointer, CurrentTime); + } + getmonitor(&mon); + if (!wflag) { + grabpointer(); + grabkeyboard(); + } + setupmenu(rootmenu, &mon); + mapmenu(rootmenu, NULL, &mon); + XFlush(dpy); + run(rootmenu, &mon); + firsttime = 0; + } else { + XAllowEvents(dpy, ReplayPointer, CurrentTime); + } + } while (rootmodeflag); /* clean stuff */ - ungrab(); cleanmenu(rootmenu); cleandc(); XrmDestroyDatabase(xdb);