X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=15ce8c75e463e74be1fae896905cc314f8b06289;hb=9a33a72c6afd9042c8395f4318bf5d21e235694d;hp=34df9ed604f8d258f907e772e67d2f56b2532532;hpb=d094ebea968e3d08b985a754aa9df30f56f649c6;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 34df9ed..15ce8c7 100644 --- a/dmenu.c +++ b/dmenu.c @@ -2,16 +2,24 @@ #include #include #include -#include #include +#include #include +#include #include +#include #include #include -#include +#ifdef XINERAMA +#include +#endif /* macros */ -#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) +#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) +#define INRECT(X,Y,RX,RY,RW,RH) ((X) >= (RX) && (X) < (RX) + (RW) && (Y) >= (RY) && (Y) < (RY) + (RH)) +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#define IS_UTF8_1ST_CHAR(c) ((((c) & 0xc0) == 0xc0) || !((c) & 0x80)) /* enums */ enum { ColFG, ColBG, ColLast }; @@ -34,96 +42,125 @@ typedef struct { typedef struct Item Item; struct Item { - Item *next; /* traverses all items */ - Item *left, *right; /* traverses items matching current search pattern */ char *text; + Item *next; /* traverses all items */ + Item *left, *right; /* traverses items matching current search pattern */ }; /* forward declarations */ -void calcoffsets(void); -void cleanup(void); -void drawmenu(void); -void drawtext(const char *text, unsigned long col[ColLast]); -void *emalloc(unsigned int size); -void eprint(const char *errstr, ...); -char *estrdup(const char *str); -unsigned long getcolor(const char *colstr); -Bool grabkeyboard(void); -void initfont(const char *fontstr); -void kpress(XKeyEvent * e); -void match(char *pattern); -void readstdin(void); -void run(void); -void setup(Bool bottom); -int strido(const char *text, const char *pattern); -unsigned int textnw(const char *text, unsigned int len); -unsigned int textw(const char *text); +static void appenditem(Item *i, Item **list, Item **last); +static void calcoffsetsh(void); +static void calcoffsetsv(void); +static char *cistrstr(const char *s, const char *sub); +static void cleanup(void); +static void drawcursor(void); +static void drawmenu(void); +static void drawmenuh(void); +static void drawmenuv(void); +static void drawtext(const char *text, unsigned long col[ColLast]); +static void eprint(const char *errstr, ...); +static unsigned long getcolor(const char *colstr); +static Bool grabkeyboard(void); +static void initfont(const char *fontstr); +static void kpress(XKeyEvent * e); +static void match(char *pattern); +static void readstdin(void); +static void run(void); +static void setup(Bool topbar); +static int textnw(const char *text, unsigned int len); +static int textw(const char *text); #include "config.h" /* variables */ -char *font = FONT; -char *maxname = NULL; -char *normbg = NORMBGCOLOR; -char *normfg = NORMFGCOLOR; -char *prompt = NULL; -char *selbg = SELBGCOLOR; -char *selfg = SELFGCOLOR; -char text[4096]; -int screen; -int ret = 0; -unsigned int cmdw = 0; -unsigned int mw, mh; -unsigned int promptw = 0; -unsigned int nitem = 0; -unsigned int numlockmask = 0; -Bool running = True; -Display *dpy; -DC dc = {0}; -Item *allitems = NULL; /* first of all items */ -Item *item = NULL; /* first of pattern matching items */ -Item *sel = NULL; -Item *next = NULL; -Item *prev = NULL; -Item *curr = NULL; -Window root, win; +static char *maxname = NULL; +static char *prompt = NULL; +static char text[4096]; +static int cmdw = 0; +static int promptw = 0; +static int ret = 0; +static int screen; +static unsigned int mw, mh; +static unsigned int cursor = 0; +static unsigned int numlockmask = 0; +static Bool running = True; +static Display *dpy; +static DC dc; +static Item *allitems = NULL; /* first of all items */ +static Item *item = NULL; /* first of pattern matching items */ +static Item *sel = NULL; +static Item *next = NULL; +static Item *prev = NULL; +static Item *curr = NULL; +static Window parent, win; +static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; +static char *(*fstrstr)(const char *, const char *) = strstr; +static unsigned int lines = 0; +static void (*calcoffsets)(void) = calcoffsetsh; + +void +appenditem(Item *i, Item **list, Item **last) { + if(!(*last)) + *list = i; + else + (*last)->right = i; + i->left = *last; + i->right = NULL; + *last = i; +} void -calcoffsets(void) { - unsigned int tw, w; +calcoffsetsh(void) { + unsigned int w; if(!curr) return; - w = promptw + cmdw + 2 * SPACE; - for(next = curr; next; next=next->right) { - tw = textw(next->text); - if(tw > mw / 3) - tw = mw / 3; - w += tw; - if(w > mw) - break; - } - w = promptw + cmdw + 2 * SPACE; - for(prev = curr; prev && prev->left; prev=prev->left) { - tw = textw(prev->left->text); - if(tw > mw / 3) - tw = mw / 3; - w += tw; - if(w > mw) - break; - } + w = promptw + cmdw + 2 * spaceitem; + for(next = curr; next && w < mw; next=next->right) + w += MIN(textw(next->text), mw / 3); + w = promptw + cmdw + 2 * spaceitem; + for(prev = curr; prev && prev->left && w < mw; prev=prev->left) + w += MIN(textw(prev->left->text), mw / 3); } void -cleanup(void) { - Item *itm; +calcoffsetsv(void) { + unsigned int h; - while(allitems) { - itm = allitems->next; - free(allitems->text); - free(allitems); - allitems = itm; + if(!curr) + return; + h = (dc.font.height + 2) * lines; + for(next = curr; next && h > 0; next = next->right) + h -= dc.font.height + 2; + h = (dc.font.height + 2) * lines; + for(prev = curr; prev && prev->left && h > 0; prev = prev->left) + h -= dc.font.height + 2; +} + +char * +cistrstr(const char *s, const char *sub) { + int c, csub; + unsigned int len; + + if(!sub) + return (char *)s; + if((c = tolower(*sub++)) != '\0') { + len = strlen(sub); + do { + do { + if((csub = *s++) == '\0') + return NULL; + } + while(tolower(csub) != c); + } + while(strncasecmp(s, sub, len) != 0); + s--; } + return (char *)s; +} + +void +cleanup(void) { if(dc.font.set) XFreeFontSet(dpy, dc.font.set); else @@ -135,79 +172,98 @@ cleanup(void) { } void -drawmenu(void) { - Item *i; +drawcursor(void) { + XRectangle r = { dc.x, dc.y + 2, 1, dc.font.height - 2 }; + r.x += textnw(text, cursor) + dc.font.height / 2; + + XSetForeground(dpy, dc.gc, dc.norm[ColFG]); + XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); +} + +void +drawmenu(void) { dc.x = 0; dc.y = 0; dc.w = mw; dc.h = mh; drawtext(NULL, dc.norm); /* print prompt? */ - if(promptw) { + if(prompt) { dc.w = promptw; drawtext(prompt, dc.sel); + dc.x += dc.w; } - dc.x += promptw; - dc.w = mw - promptw; + dc.w = mw - dc.x; /* print command */ - if(cmdw && item) + if(cmdw && item && lines == 0) dc.w = cmdw; - drawtext(text[0] ? text : NULL, dc.norm); - dc.x += cmdw; + drawtext(*text ? text : NULL, dc.norm); + drawcursor(); if(curr) { - dc.w = SPACE; - drawtext((curr && curr->left) ? "<" : NULL, dc.norm); - dc.x += dc.w; - /* determine maximum items */ - for(i = curr; i != next; i=i->right) { - dc.w = textw(i->text); - if(dc.w > mw / 3) - dc.w = mw / 3; - drawtext(i->text, (sel == i) ? dc.sel : dc.norm); - dc.x += dc.w; - } - dc.x = mw - SPACE; - dc.w = SPACE; - drawtext(next ? ">" : NULL, dc.norm); + if(lines > 0) + drawmenuv(); + else + drawmenuh(); } XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); XFlush(dpy); } +void +drawmenuh(void) { + Item *i; + + dc.x += cmdw; + dc.w = spaceitem; + drawtext(curr->left ? "<" : NULL, dc.norm); + dc.x += dc.w; + for(i = curr; i != next; i=i->right) { + dc.w = MIN(textw(i->text), mw / 3); + drawtext(i->text, (sel == i) ? dc.sel : dc.norm); + dc.x += dc.w; + } + dc.w = spaceitem; + dc.x = mw - dc.w; + drawtext(next ? ">" : NULL, dc.norm); +} + +void +drawmenuv(void) { + Item *i; + + dc.w = mw - dc.x; + dc.h = dc.font.height + 2; + dc.y = dc.h; + for(i = curr; i != next; i=i->right) { + drawtext(i->text, (sel == i) ? dc.sel : dc.norm); + dc.y += dc.h; + } + dc.h = mh - dc.y; + drawtext(NULL, dc.norm); +} + void drawtext(const char *text, unsigned long col[ColLast]) { - int x, y, w, h; - static char buf[256]; - unsigned int len, olen; + char buf[256]; + int i, x, y, h, len, olen; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; XSetForeground(dpy, dc.gc, col[ColBG]); XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); if(!text) return; - w = 0; - olen = len = strlen(text); - if(len >= sizeof buf) - len = sizeof buf - 1; - memcpy(buf, text, len); - buf[len] = 0; - h = dc.font.ascent + dc.font.descent; - y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; + olen = strlen(text); + h = dc.font.height; + y = dc.y + ((h+2) / 2) - (h / 2) + dc.font.ascent; x = dc.x + (h / 2); /* shorten text if necessary */ - while(len && (w = textnw(buf, len)) > dc.w - h) - buf[--len] = 0; - if(len < olen) { - if(len > 1) - buf[len - 1] = '.'; - if(len > 2) - buf[len - 2] = '.'; - if(len > 3) - buf[len - 3] = '.'; - } - if(w > dc.w) - return; /* too long */ + for(len = MIN(olen, sizeof buf); len && textnw(text, len) > dc.w - h; len--); + if(!len) + return; + memcpy(buf, text, len); + if(len < olen) + for(i = len; i && i > len - 3; buf[--i] = '.'); XSetForeground(dpy, dc.gc, col[ColFG]); if(dc.font.set) XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); @@ -215,15 +271,6 @@ drawtext(const char *text, unsigned long col[ColLast]) { XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); } -void * -emalloc(unsigned int size) { - void *res = malloc(size); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", size); - return res; -} - void eprint(const char *errstr, ...) { va_list ap; @@ -234,22 +281,13 @@ eprint(const char *errstr, ...) { exit(EXIT_FAILURE); } -char * -estrdup(const char *str) { - void *res = strdup(str); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", strlen(str)); - return res; -} - unsigned long getcolor(const char *colstr) { Colormap cmap = DefaultColormap(dpy, screen); XColor color; if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) - eprint("error, cannot allocate color '%s'\n", colstr); + eprint("dmenu: cannot allocate color '%s'\n", colstr); return color.pixel; } @@ -258,8 +296,8 @@ grabkeyboard(void) { unsigned int len; for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) + if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime) + == GrabSuccess) break; usleep(1000); } @@ -268,40 +306,29 @@ grabkeyboard(void) { void initfont(const char *fontstr) { - char *def, **missing; + char *def, **missing = NULL; int i, n; if(!fontstr || fontstr[0] == '\0') - eprint("error, cannot load font: '%s'\n", fontstr); - missing = NULL; - if(dc.font.set) - XFreeFontSet(dpy, dc.font.set); + eprint("dmenu: cannot load font: '%s'\n", fontstr); dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); if(missing) XFreeStringList(missing); if(dc.font.set) { - XFontSetExtents *font_extents; XFontStruct **xfonts; char **font_names; dc.font.ascent = dc.font.descent = 0; - font_extents = XExtentsOfFontSet(dc.font.set); n = XFontsOfFontSet(dc.font.set, &xfonts, &font_names); - for(i = 0, dc.font.ascent = 0, dc.font.descent = 0; i < n; i++) { - if(dc.font.ascent < (*xfonts)->ascent) - dc.font.ascent = (*xfonts)->ascent; - if(dc.font.descent < (*xfonts)->descent) - dc.font.descent = (*xfonts)->descent; + for(i = 0; i < n; i++) { + dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent); + dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent); xfonts++; } } else { - if(dc.font.xfont) - XFreeFont(dpy, dc.font.xfont); - dc.font.xfont = NULL; - if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))) { - if(!(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) - eprint("error, cannot load font: '%s'\n", fontstr); - } + if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)) + && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) + eprint("dmenu: cannot load font: '%s'\n", fontstr); dc.font.ascent = dc.font.xfont->ascent; dc.font.descent = dc.font.xfont->descent; } @@ -310,108 +337,121 @@ initfont(const char *fontstr) { void kpress(XKeyEvent * e) { - char buf[32]; - int i, num; - unsigned int len; + char buf[sizeof text]; + int num; + unsigned int i, len; KeySym ksym; len = strlen(text); - buf[0] = 0; - num = XLookupString(e, buf, sizeof buf, &ksym, 0); - if(IsKeypadKey(ksym)) { - if(ksym == XK_KP_Enter) { - ksym = XK_Return; - } else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) { - ksym = (ksym - XK_KP_0) + XK_0; - } - } - if(IsFunctionKey(ksym) || IsKeypadKey(ksym) - || IsMiscFunctionKey(ksym) || IsPFKey(ksym) - || IsPrivateKeypadKey(ksym)) + num = XLookupString(e, buf, sizeof buf, &ksym, NULL); + if(ksym == XK_KP_Enter) + ksym = XK_Return; + else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) + ksym = (ksym - XK_KP_0) + XK_0; + else if(IsFunctionKey(ksym) || IsKeypadKey(ksym) + || IsMiscFunctionKey(ksym) || IsPFKey(ksym) + || IsPrivateKeypadKey(ksym)) return; /* first check if a control mask is omitted */ if(e->state & ControlMask) { - switch (ksym) { - default: /* ignore other control sequences */ + switch(tolower(ksym)) { + default: return; - case XK_bracketleft: + case XK_a: + ksym = XK_Home; + break; + case XK_b: + ksym = XK_Left; + break; + case XK_c: ksym = XK_Escape; break; + case XK_e: + ksym = XK_End; + break; + case XK_f: + ksym = XK_Right; + break; case XK_h: - case XK_H: ksym = XK_BackSpace; break; case XK_i: - case XK_I: ksym = XK_Tab; break; case XK_j: - case XK_J: ksym = XK_Return; break; + case XK_k: + text[cursor] = '\0'; + break; + case XK_n: + ksym = XK_Down; + break; + case XK_p: + ksym = XK_Up; + break; case XK_u: - case XK_U: - text[0] = 0; + memmove(text, text + cursor, sizeof text - cursor + 1); + cursor = 0; match(text); - drawmenu(); - return; + break; case XK_w: - case XK_W: - if(len) { - i = len - 1; - while(i >= 0 && text[i] == ' ') - text[i--] = 0; - while(i >= 0 && text[i] != ' ') - text[i--] = 0; + if(cursor > 0) { + i = cursor; + while(i-- > 0 && text[i] == ' '); + while(i-- > 0 && text[i] != ' '); + memmove(text + i + 1, text + cursor, sizeof text - cursor + 1); + cursor = i + 1; match(text); - drawmenu(); } - return; - } - } - if(CLEANMASK(e->state) & Mod1Mask) { - switch(ksym) { - default: return; - case XK_h: - ksym = XK_Left; - break; - case XK_l: - ksym = XK_Right; - break; - case XK_j: - ksym = XK_Next; - break; - case XK_k: - ksym = XK_Prior; - break; - case XK_g: - ksym = XK_Home; break; - case XK_G: - ksym = XK_End; + case XK_y: + { + FILE *fp; + char *s; + if(!(fp = popen("sselp", "r"))) + eprint("dmenu: cannot popen sselp\n"); + s = fgets(buf, sizeof buf, fp); + pclose(fp); + if(s == NULL) + return; + } + num = strlen(buf); + if(num && buf[num-1] == '\n') + buf[--num] = '\0'; break; } } switch(ksym) { default: + num = MIN(num, sizeof text - cursor); if(num && !iscntrl((int) buf[0])) { - buf[num] = 0; - if(len > 0) - strncat(text, buf, sizeof text); - else - strncpy(text, buf, sizeof text); + memmove(text + cursor + num, text + cursor, sizeof text - cursor - num); + memcpy(text + cursor, buf, num); + cursor += num; match(text); } break; case XK_BackSpace: - if(len) { - text[--len] = 0; - match(text); - } + if(cursor == 0) + return; + for(i = 1; cursor - i > 0 && !IS_UTF8_1ST_CHAR(text[cursor - i]); i++); + memmove(text + cursor - i, text + cursor, sizeof text - cursor + i); + cursor -= i; + match(text); break; - case XK_End: - if(!item) + case XK_Delete: + if(cursor == len) return; + for(i = 1; cursor + i < len && !IS_UTF8_1ST_CHAR(text[cursor + i]); i++); + memmove(text + cursor, text + cursor + i, sizeof text - cursor); + match(text); + break; + case XK_End: + if(cursor < len) { + cursor = len; + break; + } while(next) { sel = curr = next; calcoffsets(); @@ -422,17 +462,26 @@ kpress(XKeyEvent * e) { case XK_Escape: ret = 1; running = False; - break; + return; case XK_Home: - if(!item) - return; + if(sel == item) { + cursor = 0; + break; + } sel = curr = item; calcoffsets(); break; case XK_Left: - if(!(sel && sel->left)) + if(cursor > 0 && (!sel || !sel->left)) { + while(cursor-- > 0 && !IS_UTF8_1ST_CHAR(text[cursor])); + break; + } + if(lines > 0) + return; + case XK_Up: + if(!sel || !sel->left) return; - sel=sel->left; + sel = sel->left; if(sel->right == curr) { curr = prev; calcoffsets(); @@ -451,19 +500,24 @@ kpress(XKeyEvent * e) { calcoffsets(); break; case XK_Return: - if((e->state & ShiftMask) && text) + if((e->state & ShiftMask) || !sel) fprintf(stdout, "%s", text); - else if(sel) + else fprintf(stdout, "%s", sel->text); - else if(text) - fprintf(stdout, "%s", text); fflush(stdout); running = False; - break; + return; case XK_Right: - if(!(sel && sel->right)) + if(cursor < len) { + while(cursor++ < len && !IS_UTF8_1ST_CHAR(text[cursor])); + break; + } + if(lines > 0) + return; + case XK_Down: + if(!sel || !sel->right) return; - sel=sel->right; + sel = sel->right; if(sel == next) { curr = next; calcoffsets(); @@ -473,6 +527,7 @@ kpress(XKeyEvent * e) { if(!sel) return; strncpy(text, sel->text, sizeof text); + cursor = strlen(text); match(text); break; } @@ -482,70 +537,61 @@ kpress(XKeyEvent * e) { void match(char *pattern) { unsigned int plen; - Item *i, *j; + Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; if(!pattern) return; plen = strlen(pattern); - item = j = NULL; - nitem = 0; - for(i = allitems; i; i=i->next) - if(!plen || !strncmp(pattern, i->text, plen)) { - if(!j) - item = i; - else - j->right = i; - i->left = j; - i->right = NULL; - j = i; - nitem++; + item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; + for(i = allitems; i; i = i->next) + if(!fstrncmp(pattern, i->text, plen + 1)) + appenditem(i, &lexact, &exactend); + else if(!fstrncmp(pattern, i->text, plen)) + appenditem(i, &lprefix, &prefixend); + else if(fstrstr(i->text, pattern)) + appenditem(i, &lsubstr, &substrend); + if(lexact) { + item = lexact; + itemend = exactend; + } + if(lprefix) { + if(itemend) { + itemend->right = lprefix; + lprefix->left = itemend; } - for(i = allitems; i; i=i->next) - if(plen && strncmp(pattern, i->text, plen) - && strstr(i->text, pattern)) { - if(!j) - item = i; - else - j->right = i; - i->left = j; - i->right = NULL; - j = i; - nitem++; - } - for(i = allitems; i; i=i->next) - if(plen && strncmp(pattern, i->text, plen) - && !strstr(i->text, pattern) - && strido(i->text,pattern)) { - if(!j) - item = i; - else - j->right = i; - i->left = j; - i->right = NULL; - j = i; - nitem++; + else + item = lprefix; + itemend = prefixend; + } + if(lsubstr) { + if(itemend) { + itemend->right = lsubstr; + lsubstr->left = itemend; } + else + item = lsubstr; + } curr = prev = next = sel = item; calcoffsets(); } void readstdin(void) { - char *p, buf[1024]; + char *p, buf[sizeof text]; unsigned int len = 0, max = 0; Item *i, *new; - i = 0; + i = NULL; while(fgets(buf, sizeof buf, stdin)) { len = strlen(buf); - if (buf[len - 1] == '\n') - buf[len - 1] = 0; - p = estrdup(buf); - if(max < len) { + if(buf[len-1] == '\n') + buf[--len] = '\0'; + if(!(p = strdup(buf))) + eprint("dmenu: cannot strdup %u bytes\n", len); + if((max = MAX(max, len)) == len) maxname = p; - max = len; - } - new = emalloc(sizeof(Item)); + if(!(new = malloc(sizeof *new))) + eprint("dmenu: cannot malloc %u bytes\n", sizeof *new); new->next = new->left = new->right = NULL; new->text = p; if(!i) @@ -563,8 +609,6 @@ run(void) { /* main event loop */ while(running && !XNextEvent(dpy, &ev)) switch (ev.type) { - default: /* ignore all crap */ - break; case KeyPress: kpress(&ev.xkey); break; @@ -572,14 +616,23 @@ run(void) { if(ev.xexpose.count == 0) drawmenu(); break; + case VisibilityNotify: + if (ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dpy, win); + break; } } void -setup(Bool bottom) { - unsigned int i, j; +setup(Bool topbar) { + int i, j, x, y; +#if XINERAMA + int n; + XineramaScreenInfo *info = NULL; +#endif XModifierKeymap *modmap; XSetWindowAttributes wa; + XWindowAttributes pwa; /* init modifier map */ modmap = XGetModifierMapping(dpy); @@ -592,52 +645,66 @@ setup(Bool bottom) { XFreeModifiermap(modmap); /* style */ - dc.norm[ColBG] = getcolor(normbg); - dc.norm[ColFG] = getcolor(normfg); - dc.sel[ColBG] = getcolor(selbg); - dc.sel[ColFG] = getcolor(selfg); + dc.norm[ColBG] = getcolor(normbgcolor); + dc.norm[ColFG] = getcolor(normfgcolor); + dc.sel[ColBG] = getcolor(selbgcolor); + dc.sel[ColFG] = getcolor(selfgcolor); initfont(font); /* menu window */ - wa.override_redirect = 1; + wa.override_redirect = True; wa.background_pixmap = ParentRelative; - wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; - mw = DisplayWidth(dpy, screen); - mh = dc.font.height + 2; - win = XCreateWindow(dpy, root, 0, - bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0, + wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask; + + /* menu window geometry */ + mh = (dc.font.height + 2) * (lines + 1); +#if XINERAMA + if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { + i = 0; + if(n > 1) { + int di; + unsigned int dui; + Window dummy; + if(XQueryPointer(dpy, parent, &dummy, &dummy, &x, &y, &di, &di, &dui)) + for(i = 0; i < n; i++) + if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) + break; + } + x = info[i].x_org; + y = topbar ? info[i].y_org : info[i].y_org + info[i].height - mh; + mw = info[i].width; + XFree(info); + } + else +#endif + { + XGetWindowAttributes(dpy, parent, &pwa); + x = 0; + y = topbar ? 0 : pwa.height - mh; + mw = pwa.width; + } + + win = XCreateWindow(dpy, parent, x, y, mw, mh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); /* pixmap */ - dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen)); - dc.gc = XCreateGC(dpy, root, 0, 0); + dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen)); + dc.gc = XCreateGC(dpy, parent, 0, NULL); XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); if(!dc.font.set) XSetFont(dpy, dc.gc, dc.font.xfont->fid); if(maxname) - cmdw = textw(maxname); - if(cmdw > mw / 3) - cmdw = mw / 3; + cmdw = MIN(textw(maxname), mw / 3); if(prompt) - promptw = textw(prompt); - if(promptw > mw / 5) - promptw = mw / 5; - text[0] = 0; + promptw = MIN(textw(prompt), mw / 5); + text[0] = '\0'; match(text); XMapRaised(dpy, win); } int -strido(const char *text, const char *pattern) { - for(; *text && *pattern; text++) - if (*text == *pattern) - pattern++; - return !*pattern; -} - -unsigned int textnw(const char *text, unsigned int len) { XRectangle r; @@ -648,61 +715,67 @@ textnw(const char *text, unsigned int len) { return XTextWidth(dc.font.xfont, text, len); } -unsigned int +int textw(const char *text) { return textnw(text, strlen(text)) + dc.font.height; } int main(int argc, char *argv[]) { - Bool bottom = False; unsigned int i; + Bool topbar = True; /* command line args */ for(i = 1; i < argc; i++) - if(!strcmp(argv[i], "-b")) { - bottom = True; + if(!strcmp(argv[i], "-i")) { + fstrncmp = strncasecmp; + fstrstr = cistrstr; + } + else if(!strcmp(argv[i], "-b")) + topbar = False; + else if(!strcmp(argv[i], "-e")) { + if(++i < argc) parent = atoi(argv[i]); + } + else if(!strcmp(argv[i], "-l")) { + if(++i < argc) lines = atoi(argv[i]); + if(lines > 0) + calcoffsets = calcoffsetsv; } else if(!strcmp(argv[i], "-fn")) { if(++i < argc) font = argv[i]; } else if(!strcmp(argv[i], "-nb")) { - if(++i < argc) normbg = argv[i]; + if(++i < argc) normbgcolor = argv[i]; } else if(!strcmp(argv[i], "-nf")) { - if(++i < argc) normfg = argv[i]; + if(++i < argc) normfgcolor = argv[i]; } else if(!strcmp(argv[i], "-p")) { if(++i < argc) prompt = argv[i]; } else if(!strcmp(argv[i], "-sb")) { - if(++i < argc) selbg = argv[i]; + if(++i < argc) selbgcolor = argv[i]; } else if(!strcmp(argv[i], "-sf")) { - if(++i < argc) selfg = argv[i]; + if(++i < argc) selfgcolor = argv[i]; } else if(!strcmp(argv[i], "-v")) - eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n"); + eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n"); else - eprint("usage: dmenu [-b] [-fn ] [-nb ] [-nf ]\n" - " [-p ] [-sb ] [-sf ] [-v]\n"); - setlocale(LC_CTYPE, ""); - dpy = XOpenDisplay(0); - if(!dpy) + eprint("usage: dmenu [-i] [-b] [-e ] [-l ] [-fn ] [-nb ]\n" + " [-nf ] [-p ] [-sb ] [-sf ] [-v]\n"); + if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fprintf(stderr, "dmenu: warning: no locale support\n"); + if(!(dpy = XOpenDisplay(NULL))) eprint("dmenu: cannot open display\n"); screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); + if(!parent) + parent = RootWindow(dpy, screen); - if(isatty(STDIN_FILENO)) { - readstdin(); - running = grabkeyboard(); - } - else { /* prevent keypress loss */ - running = grabkeyboard(); - readstdin(); - } + readstdin(); + running = grabkeyboard(); - setup(bottom); + setup(topbar); drawmenu(); XSync(dpy, False); run();