X-Git-Url: https://git.subgeniuskitty.com/xmenu/.git/blobdiff_plain/3d8536642e0a252737588654a9142962348302d6..70063f16f5da4e9eef33d369a41d7a0365ca11fa:/xmenu.c diff --git a/xmenu.c b/xmenu.c index a80876d..3c83cd3 100644 --- a/xmenu.c +++ b/xmenu.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "xmenu.h" @@ -21,14 +22,15 @@ */ /* argument parser */ -static void parseposition(const char *optarg); +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 initconfig(void); +static void initiconsize(void); static void initatoms(void); /* structure builders, and their helper routines */ @@ -39,6 +41,7 @@ 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 */ @@ -87,13 +90,15 @@ static Visual *visual; static Window rootwin; static Colormap colormap; static struct DC dc; +static struct Monitor mon; static Atom utf8string; static Atom wmdelete; static Atom netatom[NetLast]; /* flags */ static int iflag = 0; /* whether to disable icons */ -static int pflag = 0; /* whether the user specified a position */ +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 */ /* include config variable */ @@ -153,9 +158,10 @@ main(int argc, char *argv[]) } /* initializers */ + initmonitor(); initresources(); initdc(); - initconfig(); + initiconsize(); initatoms(); /* set window class */ @@ -187,12 +193,13 @@ main(int argc, char *argv[]) return 0; } -/* parse position string from -p, put results on config.x and config.y */ +/* parse position string from -p, + * put results on config.posx, config.posy, and config.monitor */ static void -parseposition(const char *optarg) +parseposition(char *optarg) { long n; - const char *s = optarg; + char *s = optarg; char *endp; n = strtol(s, &endp, 10); @@ -201,9 +208,24 @@ parseposition(const char *optarg) config.posx = n; s = endp+1; n = strtol(s, &endp, 10); - if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0') + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s) goto error; config.posy = n; + if (*endp == ':') { + s = endp+1; + mflag = 1; + if (strncasecmp(s, "CUR", 3) == 0) { + config.monitor = -1; + endp = s+3; + } else { + n = strtol(s, &endp, 10); + if (errno == ERANGE || n > INT_MAX || n < 0 || endp == s || *endp != '\0') + goto error; + config.monitor = n; + } + } else if (*endp != '\0') { + goto error; + } return; @@ -234,12 +256,16 @@ 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"); } @@ -253,6 +279,54 @@ ealloccolor(const char *s, XftColor *color) errx(1, "cannot allocate color: %s", s); } +/* query monitor information and cursor position */ +static void +initmonitor(void) +{ + XineramaScreenInfo *info = NULL; + Window dw; /* dummy variable */ + int di; /* dummy variable */ + unsigned du; /* dummy variable */ + int cursx, cursy; /* cursor position */ + int nmons; + int i; + + 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); + + if ((info = XineramaQueryScreens(dpy, &nmons)) != NULL) { + int selmon = 0; + + 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)) { + selmon = i; + break; + } + } + } else { + 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; + } + + if (!pflag) { + config.posx = cursx; + config.posy = cursy; + } else if (mflag) { + config.posx += mon.x; + config.posy += mon.y; + } +} + /* read xrdb for configuration options */ static void initresources(void) @@ -321,18 +395,10 @@ initdc(void) dc.gc = XCreateGC(dpy, rootwin, 0, NULL); } -/* calculate configuration values that are not set manually */ +/* calculate icon size */ static void -initconfig(void) +initiconsize(void) { - Window dw; /* dummy variable */ - int di; /* dummy variable */ - unsigned du; /* dummy variable */ - - if (!pflag) /* if the user haven't specified a position, use cursor position*/ - XQueryPointer(dpy, rootwin, &dw, &dw, &config.posx, &config.posy, &di, &di, &du); - config.screenw = DisplayWidth(dpy, screen); - config.screenh = DisplayHeight(dpy, screen); config.iconsize = config.height_pixels - config.iconpadding * 2; } @@ -376,10 +442,6 @@ allocitem(const char *label, const char *output, char *file) } item->y = 0; item->h = 0; - if (item->label == NULL) - item->labellen = 0; - else - item->labellen = strlen(item->label); item->next = NULL; item->submenu = NULL; item->icon = NULL; @@ -400,12 +462,13 @@ allocmenu(struct Menu *parent, struct Item *list, unsigned level) menu->list = list; menu->caller = NULL; menu->selected = NULL; - menu->w = 0; /* calculated by setupmenu() */ - menu->h = 0; /* calculated by setupmenu() */ - menu->x = 0; /* calculated by setupmenu() */ - menu->y = 0; /* calculated by setupmenu() */ + 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; swa.override_redirect = (wflag) ? False : True; swa.background_pixel = dc.normal[ColorBG].pixel; @@ -480,6 +543,9 @@ buildmenutree(unsigned level, const char *label, const char *output, char *file) curritem->prev = NULL; } + if (curritem->file) + prevmenu->hasicon = 1; + return rootmenu; } @@ -557,7 +623,7 @@ getnextutf8char(const char *s, const char **next_ret) s++; for (i = 1; i < usize; i++) { *next_ret = s+1; - /* if byte is EOS or is not a continuation byte, return unknown */ + /* if byte is nul or is not a continuation byte, return unknown */ if (*s == '\0' || ((unsigned char)*s & utfmask[0]) != utfbyte[0]) return unknown; /* 6 is the number of relevant bits in the continuation byte */ @@ -573,51 +639,87 @@ getnextutf8char(const char *s, const char **next_ret) return ucode; } -/* draw text into XftDraw */ +/* get which font contains a given code point */ +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]; + + /* 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 */ static int drawtext(XftDraw *draw, XftColor *color, int x, int y, unsigned h, const char *text) { - const char *s, *nexts; - FcChar32 ucode; - XftFont *currfont; - int textlen = 0; + int textwidth = 0; - s = text; - while (*s) { + while (*text) { + XftFont *currfont; XGlyphInfo ext; - int charexists; + FcChar32 ucode; + const char *next; size_t len; - size_t i; - - charexists = 0; - ucode = getnextutf8char(s, &nexts); - for (i = 0; i < dc.nfonts; i++) { - charexists = XftCharExists(dpy, dc.fonts[i], ucode); - if (charexists) - break; - } - if (charexists) - currfont = dc.fonts[i]; - len = nexts - s; + ucode = getnextutf8char(text, &next); + currfont = getfontucode(ucode); - XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)s, - len, &ext); - textlen += ext.xOff; + len = next - text; + XftTextExtentsUtf8(dpy, currfont, (XftChar8 *)text, len, &ext); + textwidth += ext.xOff; if (draw) { int texty; - texty = y + (h + currfont->ascent) / 2; - XftDrawStringUtf8(draw, color, currfont, x, texty, - (XftChar8 *)s, len); + texty = y + (h - (currfont->ascent + currfont->descent))/2 + currfont->ascent; + XftDrawStringUtf8(draw, color, currfont, x, texty, (XftChar8 *)text, len); x += ext.xOff; } - s = nexts; + text = next; } - return textlen; + return textwidth; } /* setup the height, width and icon of the items of a menu */ @@ -640,7 +742,7 @@ setupitems(struct Menu *menu) menu->h += item->h; if (item->label) - textwidth = drawtext(NULL, NULL, 0, 0, item->h, item->label); + textwidth = drawtext(NULL, NULL, 0, 0, 0, item->label); else textwidth = 0; @@ -657,7 +759,7 @@ setupitems(struct Menu *menu) * padding appears 3 times: before the label and around the triangle. */ itemwidth = textwidth + config.triangle_width + config.horzpadding * 3; - itemwidth += (iflag) ? 0 : config.iconsize + config.horzpadding; + itemwidth += (iflag || !menu->hasicon) ? 0 : config.iconsize + config.horzpadding; menu->w = MAX(menu->w, itemwidth); } } @@ -671,27 +773,29 @@ 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.screenw - config.posx >= menu->w) + 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.screenh - config.posy >= height) + if (pflag || (config.posy > mon.y && mon.y + mon.h - config.posy >= height)) menu->y = config.posy; - else if (config.screenh > height) - menu->y = config.screenh - height; + else if (mon.y + mon.h > height) + menu->y = mon.y + mon.h - height; } else { /* else, calculate in respect to parent menu */ - if (config.screenw - (menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels) >= width) - menu->x = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels; + int parentwidth; + + parentwidth = menu->parent->x + menu->parent->w + config.border_pixels + config.gap_pixels; + + 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 (config.screenh - (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 (config.screenh - menu->parent->y > height) - menu->y = menu->parent->y; - else if (config.screenh > height) - menu->y = config.screenh - height; + else if (mon.y + mon.h > height) + menu->y = mon.y + mon.h - height; } } @@ -726,7 +830,7 @@ setupmenu(struct Menu *menu, XClassHint *classh) XStringListToTextProperty(&title, 1, &wintitle); /* set window manager hints */ - sizeh.flags = PMaxSize | PMinSize; + 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); @@ -837,7 +941,7 @@ drawitems(struct Menu *menu) /* draw text */ x = config.horzpadding; - x += (iflag) ? 0 : config.horzpadding + config.iconsize; + x += (iflag || !menu->hasicon) ? 0 : config.horzpadding + config.iconsize; dsel = XftDrawCreate(dpy, item->sel, visual, colormap); dunsel = XftDrawCreate(dpy, item->unsel, visual, colormap); XSetForeground(dpy, dc.gc, dc.selected[ColorFG].pixel); @@ -871,8 +975,8 @@ drawitems(struct Menu *menu) if (item->file != NULL && !iflag) { item->icon = loadicon(item->file); - imlib_context_set_drawable(item->sel); 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); @@ -1186,6 +1290,8 @@ cleanmenu(struct Menu *menu) static void cleanup(void) { + size_t i; + XUngrabPointer(dpy, CurrentTime); XUngrabKeyboard(dpy, CurrentTime); @@ -1196,6 +1302,9 @@ cleanup(void) 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); }