X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=be9b41b5e0c8615d69941f28e45cb86083f879ee;hb=569a1f925a7cf351e6ec3e38529f46a1d9becf3f;hp=b6841754db63165d6c687cb59bc56afa5ff70a0c;hpb=06ae8944344cd6f7d0aa007b7b036e77cb87fdf1;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index b684175..be9b41b 100644 --- a/dmenu.c +++ b/dmenu.c @@ -2,16 +2,23 @@ #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)) /* enums */ enum { ColFG, ColBG, ColLast }; @@ -34,146 +41,81 @@ typedef struct { typedef struct Item Item; struct Item { + char *text; Item *next; /* traverses all items */ Item *left, *right; /* traverses items matching current search pattern */ - char *text; }; /* forward declarations */ -static void *emalloc(unsigned int size); -static void eprint(const char *errstr, ...); -static char *estrdup(const char *str); +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 drawmenuh(void); +static void drawmenuv(void); static void drawtext(const char *text, unsigned long col[ColLast]); -static unsigned int textw(const char *text); -static unsigned int textnw(const char *text, unsigned int len); -static void calcoffsets(void); -static void drawmenu(void); -static Bool grabkeyboard(void); +static void eprint(const char *errstr, ...); static unsigned long getcolor(const char *colstr); +static Bool grabkeyboard(void); static void initfont(const char *fontstr); -static int strido(const char *text, const char *pattern); -static void match(char *pattern); static void kpress(XKeyEvent * e); -static char *readstdin(void); -static void usage(void); +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 */ -static int screen; -static Display *dpy; -static DC dc = {0}; -static char text[4096]; +static char *maxname = NULL; static char *prompt = NULL; -static int mw, mh; +static char text[4096]; +static int cmdw = 0; +static int promptw = 0; static int ret = 0; -static int nitem = 0; -static unsigned int cmdw = 0; -static unsigned int promptw = 0; +static int cursor = 0; +static int screen; +static unsigned int mw, mh; 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 root; -static Window win; - -#include "config.h" - -static void * -emalloc(unsigned int size) { - void *res = malloc(size); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", size); - return res; -} - -static void -eprint(const char *errstr, ...) { - va_list ap; - - va_start(ap, errstr); - vfprintf(stderr, errstr, ap); - va_end(ap); - exit(EXIT_FAILURE); -} - -static char * -estrdup(const char *str) { - void *res = strdup(str); - - if(!res) - eprint("fatal: could not malloc() %u bytes\n", strlen(str)); - return res; -} - - -static void -drawtext(const char *text, unsigned long col[ColLast]) { - int x, y, w, h; - static char buf[256]; - unsigned int 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; - 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 */ - XSetForeground(dpy, dc.gc, col[ColFG]); - if(dc.font.set) - XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len); +static Window root, win; +static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp; +static char *(*fstrstr)(const char *, const char *) = strstr; +static Bool vlist = False; +static unsigned int lines = 5; +static void (*calcoffsets)(void) = calcoffsetsh; +static void (*drawmenu)(void) = drawmenuh; + +void +appenditem(Item *i, Item **list, Item **last) { + if(!(*last)) + *list = i; else - XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); + (*last)->right = i; + i->left = *last; + i->right = NULL; + *last = i; } -static unsigned int -textw(const char *text) { - return textnw(text, strlen(text)) + dc.font.height; -} - -static unsigned int -textnw(const char *text, unsigned int len) { - XRectangle r; - - if(dc.font.set) { - XmbTextExtents(dc.font.set, text, len, NULL, &r); - return r.width; - } - return XTextWidth(dc.font.xfont, text, len); -} - -static void -calcoffsets(void) { - unsigned int tw, w; +void +calcoffsetsh(void) { + int tw; + unsigned int w; if(!curr) return; - w = promptw + cmdw + 2 * SPACE; + w = promptw + cmdw + 2 * spaceitem; for(next = curr; next; next=next->right) { tw = textw(next->text); if(tw > mw / 3) @@ -182,7 +124,7 @@ calcoffsets(void) { if(w > mw) break; } - w = promptw + cmdw + 2 * SPACE; + w = promptw + cmdw + 2 * spaceitem; for(prev = curr; prev && prev->left; prev=prev->left) { tw = textw(prev->left->text); if(tw > mw / 3) @@ -193,8 +135,81 @@ calcoffsets(void) { } } -static void -drawmenu(void) { +void +calcoffsetsv(void) { + static unsigned int w; + + if(!curr) + return; + w = (dc.font.height + 2) * (lines + 1); + for(next = curr; next; next=next->right) { + w -= dc.font.height + 2; + if(w <= 0) + break; + } + w = (dc.font.height + 2) * (lines + 1); + for(prev = curr; prev && prev->left; prev=prev->left) { + w -= dc.font.height + 2; + if(w <= 0) + break; + } +} + +char * +cistrstr(const char *s, const char *sub) { + int c, csub; + unsigned int len; + + if(!sub) + return (char *)s; + if((c = *sub++) != 0) { + c = tolower(c); + 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) { + Item *itm; + + while(allitems) { + itm = allitems->next; + free(allitems->text); + free(allitems); + allitems = itm; + } + if(dc.font.set) + XFreeFontSet(dpy, dc.font.set); + else + XFreeFont(dpy, dc.font.xfont); + XFreePixmap(dpy, dc.drawable); + XFreeGC(dpy, dc.gc); + XDestroyWindow(dpy, win); + XUngrabKeyboard(dpy, CurrentTime); +} + +void +drawcursor(void) { + XRectangle r = { dc.x, dc.y + 2, 1, dc.h - 4 }; + + 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 +drawmenuh(void) { Item *i; dc.x = 0; @@ -213,9 +228,10 @@ drawmenu(void) { if(cmdw && item) dc.w = cmdw; drawtext(text[0] ? text : NULL, dc.norm); + drawcursor(); dc.x += cmdw; if(curr) { - dc.w = SPACE; + dc.w = spaceitem; drawtext((curr && curr->left) ? "<" : NULL, dc.norm); dc.x += dc.w; /* determine maximum items */ @@ -226,28 +242,86 @@ drawmenu(void) { drawtext(i->text, (sel == i) ? dc.sel : dc.norm); dc.x += dc.w; } - dc.x = mw - SPACE; - dc.w = SPACE; + dc.x = mw - spaceitem; + dc.w = spaceitem; drawtext(next ? ">" : NULL, dc.norm); } XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); XFlush(dpy); } -static Bool -grabkeyboard(void) { - unsigned int len; +void +drawmenuv(void) { + Item *i; - for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) - break; - usleep(1000); + dc.x = 0; + dc.y = 0; + dc.w = mw; + dc.h = mh; + drawtext(NULL, dc.norm); + /* print prompt? */ + if(promptw) { + dc.w = promptw; + drawtext(prompt, dc.sel); } - return len > 0; + dc.x += promptw; + dc.w = mw - promptw; + /* print command */ + drawtext(text[0] ? text : NULL, dc.norm); + if(curr) { + dc.x = 0; + dc.w = mw; + dc.y += dc.font.height + 2; + /* determine maximum items */ + for(i = curr; i != next; i=i->right) { + drawtext(i->text, (sel == i) ? dc.sel : dc.norm); + dc.y += dc.font.height + 2; + } + drawtext(NULL, dc.norm); + } + XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); + XFlush(dpy); } -static unsigned long +void +drawtext(const char *text, unsigned long col[ColLast]) { + 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; + 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 */ + 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); + else + XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len); +} + +void +eprint(const char *errstr, ...) { + va_list ap; + + va_start(ap, errstr); + vfprintf(stderr, errstr, ap); + va_end(ap); + exit(EXIT_FAILURE); +} + +unsigned long getcolor(const char *colstr) { Colormap cmap = DefaultColormap(dpy, screen); XColor color; @@ -257,7 +331,20 @@ getcolor(const char *colstr) { return color.pixel; } -static void +Bool +grabkeyboard(void) { + unsigned int len; + + for(len = 1000; len; len--) { + if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) + == GrabSuccess) + break; + usleep(1000); + } + return len > 0; +} + +void initfont(const char *fontstr) { char *def, **missing; int i, n; @@ -265,8 +352,6 @@ initfont(const char *fontstr) { if(!fontstr || fontstr[0] == '\0') eprint("error, cannot load font: '%s'\n", fontstr); missing = NULL; - if(dc.font.set) - XFreeFontSet(dpy, dc.font.set); dc.font.set = XCreateFontSet(dpy, fontstr, &missing, &n, &def); if(missing) XFreeStringList(missing); @@ -286,78 +371,16 @@ initfont(const char *fontstr) { } } 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("error, cannot load font: '%s'\n", fontstr); dc.font.ascent = dc.font.xfont->ascent; dc.font.descent = dc.font.xfont->descent; } dc.font.height = dc.font.ascent + dc.font.descent; } -static int -strido(const char *text, const char *pattern) { - for(; *text && *pattern; text++) - if (*text == *pattern) - pattern++; - return !*pattern; -} - -static void -match(char *pattern) { - unsigned int plen; - Item *i, *j; - - 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++; - } - 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++; - } - curr = prev = next = sel = item; - calcoffsets(); -} - -static void +void kpress(XKeyEvent * e) { char buf[32]; int i, num; @@ -366,17 +389,16 @@ kpress(XKeyEvent * e) { len = strlen(text); buf[0] = 0; - num = XLookupString(e, buf, sizeof buf, &ksym, 0); - if(IsKeypadKey(ksym)) { - if(ksym == XK_KP_Enter) { + num = XLookupString(e, buf, sizeof buf, &ksym, NULL); + if(IsKeypadKey(ksym)) { + if(ksym == XK_KP_Enter) ksym = XK_Return; - } else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) { + 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)) + || IsMiscFunctionKey(ksym) || IsPFKey(ksym) + || IsPrivateKeypadKey(ksym)) return; /* first check if a control mask is omitted */ if(e->state & ControlMask) { @@ -403,7 +425,7 @@ kpress(XKeyEvent * e) { text[0] = 0; match(text); drawmenu(); - return; + break; case XK_w: case XK_W: if(len) { @@ -415,7 +437,7 @@ kpress(XKeyEvent * e) { match(text); drawmenu(); } - return; + break; } } if(CLEANMASK(e->state) & Mod1Mask) { @@ -439,22 +461,39 @@ kpress(XKeyEvent * e) { case XK_G: ksym = XK_End; break; + case XK_p: + { + FILE *fp; + char *c; + if(!(fp = (FILE*)popen("sselp", "r"))) + fprintf(stderr, "dmenu: Could not popen sselp\n"); + c = fgets(text + len, sizeof(text) - len, fp); + pclose(fp); + if(c == NULL) + return; + } + len = strlen(text); + if(len && text[len-1] == '\n') + text[--len] = '\0'; + match(text); + drawmenu(); + return; } } switch(ksym) { default: 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); + strncpy(text + cursor, buf, sizeof text - cursor); + cursor+=num; match(text); } break; case XK_BackSpace: - if(len) { - text[--len] = 0; + if(cursor > 0) { + memmove(text + cursor + -1, text + cursor, sizeof text - cursor); + cursor--; match(text); } break; @@ -479,13 +518,18 @@ kpress(XKeyEvent * e) { calcoffsets(); break; case XK_Left: - if(!(sel && sel->left)) - return; - sel=sel->left; - if(sel->right == curr) { - curr = prev; - calcoffsets(); + case XK_Up: + if(sel && sel->left){ + sel=sel->left; + if(sel->right == curr) { + curr = prev; + calcoffsets(); + } } + else if(cursor > 0) + cursor--; + else + return; break; case XK_Next: if(!next) @@ -500,37 +544,86 @@ kpress(XKeyEvent * e) { calcoffsets(); break; case XK_Return: - if((e->state & ShiftMask) && text) + if((e->state & ShiftMask) && *text) fprintf(stdout, "%s", text); else if(sel) fprintf(stdout, "%s", sel->text); - else if(text) + else if(*text) fprintf(stdout, "%s", text); fflush(stdout); running = False; break; case XK_Right: - if(!(sel && sel->right)) - return; - sel=sel->right; - if(sel == next) { - curr = next; - calcoffsets(); + case XK_Down: + if(cursor < len) + cursor++; + else if(sel && sel->right) { + sel=sel->right; + if(sel == next) { + curr = next; + calcoffsets(); + } } + else + return; break; case XK_Tab: if(!sel) return; strncpy(text, sel->text, sizeof text); + cursor = strlen(text); match(text); break; } + len = strlen(text); + cursor = MIN(cursor, len); + cursor = MAX(cursor, 0); drawmenu(); } -static char * +void +match(char *pattern) { + unsigned int plen; + Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; + + if(!pattern) + return; + plen = strlen(pattern); + 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; + } + 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) { - static char *maxname = NULL; char *p, buf[1024]; unsigned int len = 0, max = 0; Item *i, *new; @@ -540,12 +633,14 @@ readstdin(void) { len = strlen(buf); if (buf[len - 1] == '\n') buf[len - 1] = 0; - p = estrdup(buf); + if(!(p = strdup(buf))) + eprint("fatal: could not strdup() %u bytes\n", strlen(buf)); if(max < len) { maxname = p; max = len; } - new = emalloc(sizeof(Item)); + if(!(new = (Item *)malloc(sizeof(Item)))) + eprint("fatal: could not malloc() %u bytes\n", sizeof(Item)); new->next = new->left = new->right = NULL; new->text = p; if(!i) @@ -554,102 +649,95 @@ readstdin(void) { i->next = new; i = new; } - - return maxname; } -static void -usage(void) { - eprint("usage: dmenu [-b] [-fn ] [-nb ] [-nf ]\n" - " [-p ] [-sb ] [-sf ] [-v]\n"); +void +run(void) { + XEvent ev; + + /* main event loop */ + while(running && !XNextEvent(dpy, &ev)) + switch (ev.type) { + default: /* ignore all crap */ + break; + case KeyPress: + kpress(&ev.xkey); + break; + case Expose: + if(ev.xexpose.count == 0) + drawmenu(); + break; + } } -int -main(int argc, char *argv[]) { - Bool bottom = False; - char *font = FONT; - char *maxname; - char *normbg = NORMBGCOLOR; - char *normfg = NORMFGCOLOR; - char *selbg = SELBGCOLOR; - char *selfg = SELFGCOLOR; - int i, j; - Item *itm; - XEvent ev; +void +setup(Bool topbar) { + int i, j, x, y; +#if XINERAMA + int n; + XineramaScreenInfo *info = NULL; +#endif XModifierKeymap *modmap; XSetWindowAttributes wa; - /* command line args */ - for(i = 1; i < argc; i++) - if(!strcmp(argv[i], "-b")) { - bottom = True; - } - else if(!strcmp(argv[i], "-fn")) { - if(++i < argc) font = argv[i]; - } - else if(!strcmp(argv[i], "-nb")) { - if(++i < argc) normbg = argv[i]; - } - else if(!strcmp(argv[i], "-nf")) { - if(++i < argc) normfg = 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]; - } - else if(!strcmp(argv[i], "-sf")) { - if(++i < argc) selfg = argv[i]; - } - else if(!strcmp(argv[i], "-v")) - eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n"); - else - usage(); - setlocale(LC_CTYPE, ""); - dpy = XOpenDisplay(0); - if(!dpy) - eprint("dmenu: cannot open display\n"); - screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); - if(isatty(STDIN_FILENO)) { - maxname = readstdin(); - running = grabkeyboard(); - } - else { /* prevent keypress loss */ - running = grabkeyboard(); - maxname = readstdin(); - } /* init modifier map */ modmap = XGetModifierMapping(dpy); - for (i = 0; i < 8; i++) { - for (j = 0; j < modmap->max_keypermod; j++) { + for(i = 0; i < 8; i++) + for(j = 0; j < modmap->max_keypermod; j++) { if(modmap->modifiermap[i * modmap->max_keypermod + j] == XKeysymToKeycode(dpy, XK_Num_Lock)) numlockmask = (1 << i); } - } 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); + + /* menu window geometry */ mh = dc.font.height + 2; - win = XCreateWindow(dpy, root, 0, - bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0, + mh = vlist ? mh * (lines+1) : mh; +#if XINERAMA + if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { + i = 0; + if(n > 1) { + int di; + unsigned int dui; + Window dummy; + if(XQueryPointer(dpy, root, &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 + { + x = 0; + y = topbar ? 0 : DisplayHeight(dpy, screen) - mh; + mw = DisplayWidth(dpy, screen); + } + + win = XCreateWindow(dpy, root, 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.gc = XCreateGC(dpy, root, 0, NULL); XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); if(!dc.font.set) XSetFont(dpy, dc.gc, dc.font.xfont->fid); @@ -664,38 +752,87 @@ main(int argc, char *argv[]) { text[0] = 0; match(text); XMapRaised(dpy, win); - drawmenu(); - XSync(dpy, False); +} - /* main event loop */ - while(running && !XNextEvent(dpy, &ev)) - switch (ev.type) { - default: /* ignore all crap */ - break; - case KeyPress: - kpress(&ev.xkey); - break; - case Expose: - if(ev.xexpose.count == 0) - drawmenu(); - break; +int +textnw(const char *text, unsigned int len) { + XRectangle r; + + if(dc.font.set) { + XmbTextExtents(dc.font.set, text, len, NULL, &r); + return r.width; + } + return XTextWidth(dc.font.xfont, text, len); +} + +int +textw(const char *text) { + return textnw(text, strlen(text)) + dc.font.height; +} + +int +main(int argc, char *argv[]) { + unsigned int i; + Bool topbar = True; + + /* command line args */ + for(i = 1; i < argc; i++) + if(!strcmp(argv[i], "-i")) { + fstrncmp = strncasecmp; + fstrstr = cistrstr; + } + else if(!strcmp(argv[i], "-b")) + topbar = False; + else if(!strcmp(argv[i], "-l")) { + vlist = True; + calcoffsets = calcoffsetsv; + drawmenu = drawmenuv; + if(++i < argc) lines += atoi(argv[i]); + } + else if(!strcmp(argv[i], "-fn")) { + if(++i < argc) font = argv[i]; + } + else if(!strcmp(argv[i], "-nb")) { + if(++i < argc) normbgcolor = argv[i]; + } + else if(!strcmp(argv[i], "-nf")) { + 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) selbgcolor = argv[i]; + } + else if(!strcmp(argv[i], "-sf")) { + if(++i < argc) selfgcolor = argv[i]; + } + else if(!strcmp(argv[i], "-v")) + eprint("dmenu-"VERSION", © 2006-2009 dmenu engineers, see LICENSE for details\n"); + else + eprint("usage: dmenu [-i] [-b] [-l ] [-fn ] [-nb ] [-nf ]\n" + " [-p ] [-sb ] [-sf ] [-v]\n"); + if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fprintf(stderr, "warning: no locale support\n"); + if(!(dpy = XOpenDisplay(NULL))) + eprint("dmenu: cannot open display\n"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); - /* cleanup */ - while(allitems) { - itm = allitems->next; - free(allitems->text); - free(allitems); - allitems = itm; + if(isatty(STDIN_FILENO)) { + readstdin(); + running = grabkeyboard(); } - if(dc.font.set) - XFreeFontSet(dpy, dc.font.set); - else - XFreeFont(dpy, dc.font.xfont); - XFreePixmap(dpy, dc.drawable); - XFreeGC(dpy, dc.gc); - XDestroyWindow(dpy, win); - XUngrabKeyboard(dpy, CurrentTime); + else { /* prevent keypress loss */ + running = grabkeyboard(); + readstdin(); + } + + setup(topbar); + drawmenu(); + XSync(dpy, False); + run(); + cleanup(); XCloseDisplay(dpy); return ret; }