X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=1fdf7f5a20158c733f6c2abc4b8cba1d973c1693;hb=7d5fe17391fefd978eab281a6cbebe2aa601e9ce;hp=be9b41b5e0c8615d69941f28e45cb86083f879ee;hpb=569a1f925a7cf351e6ec3e38529f46a1d9becf3f;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index be9b41b..1fdf7f5 100644 --- a/dmenu.c +++ b/dmenu.c @@ -1,11 +1,9 @@ /* See LICENSE file for copyright and license details. */ #include #include -#include #include #include #include -#include #include #include #include @@ -13,89 +11,64 @@ #ifdef XINERAMA #include #endif +#include +#include "config.h" -/* macros */ -#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 }; - -/* typedefs */ -typedef struct { - int x, y, w, h; - unsigned long norm[ColLast]; - unsigned long sel[ColLast]; - Drawable drawable; - GC gc; - struct { - XFontStruct *xfont; - XFontSet set; - int ascent; - int descent; - int height; - } font; -} DC; /* draw context */ +#define INRECT(x,y,rx,ry,rw,rh) ((rx) < (x) && (x) < (rx)+(rw) && (ry) < (y) && (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) == 0x00) typedef struct Item Item; struct Item { char *text; - Item *next; /* traverses all items */ - Item *left, *right; /* traverses items matching current search pattern */ + Item *next; /* traverses all items */ + Item *left, *right; /* traverses items matching current search pattern */ }; -/* forward declarations */ 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 drawitem(const char *s, unsigned long col[ColLast]); +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 grabkeyboard(void); +static void keypress(XKeyEvent *e); +static void match(void); 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" +static void setup(void); -/* variables */ +static char **argp = NULL; static char *maxname = NULL; -static char *prompt = NULL; +static char *prompt; static char text[4096]; -static int cmdw = 0; -static int promptw = 0; -static int ret = 0; -static int cursor = 0; +static int promptw; static int screen; +static size_t cur = 0; +static unsigned int cmdw = 0; +static unsigned int lines = 0; +static unsigned int numlockmask; static unsigned int mw, mh; -static unsigned int numlockmask = 0; -static Bool running = True; -static Display *dpy; +static unsigned long normcol[ColLast]; +static unsigned long selcol[ColLast]; +static Bool topbar = True; static DC dc; -static Item *allitems = NULL; /* first of all items */ -static Item *item = NULL; /* first of pattern matching items */ +static Display *dpy; +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, win; -static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp; +static Window win, root; + +static int (*fstrncmp)(const char *, const char *, size_t) = 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) { @@ -110,49 +83,27 @@ appenditem(Item *i, Item **list, Item **last) { void calcoffsetsh(void) { - int tw; - unsigned int w; + unsigned int w, x; - if(!curr) - return; - w = promptw + cmdw + 2 * spaceitem; - for(next = curr; next; next=next->right) { - tw = textw(next->text); - if(tw > mw / 3) - tw = mw / 3; - w += tw; - if(w > mw) + w = promptw + cmdw + textw(&dc, "<") + textw(&dc, ">"); + for(x = w, next = curr; next; next = next->right) + if((x += MIN(textw(&dc, next->text), mw / 3)) > mw) break; - } - w = promptw + cmdw + 2 * spaceitem; - 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) + for(x = w, prev = curr; prev && prev->left; prev = prev->left) + if((x += MIN(textw(&dc, prev->left->text), mw / 3)) > mw) break; - } } void calcoffsetsv(void) { - static unsigned int w; + unsigned int i; - 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; - } + next = prev = curr; + for(i = 0; i < lines && next; i++) + next = next->right; + mh = (dc.font.height + 2) * (i + 1); + for(i = 0; i < lines && prev && prev->left; i++) + prev = prev->left; } char * @@ -162,12 +113,11 @@ cistrstr(const char *s, const char *sub) { if(!sub) return (char *)s; - if((c = *sub++) != 0) { - c = tolower(c); + if((c = tolower(*sub++)) != '\0') { len = strlen(sub); do { do { - if((csub = *s++) == 0) + if((csub = *s++) == '\0') return NULL; } while(tolower(csub) != c); @@ -188,318 +138,216 @@ cleanup(void) { 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); + cleanupdraw(&dc); XDestroyWindow(dpy, win); XUngrabKeyboard(dpy, CurrentTime); + XCloseDisplay(dpy); } 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); +drawitem(const char *s, unsigned long col[ColLast]) { + const char *p; + unsigned int w = textnw(&dc, text, strlen(text)); + + drawbox(&dc, col); + drawtext(&dc, s, col); + for(p = fstrstr(s, text); *text && (p = fstrstr(p, text)); p++) + drawline(&dc, textnw(&dc, s, p-s) + dc.h/2 - 1, dc.h-2, w, 1, col); } void -drawmenuh(void) { - Item *i; - +drawmenu(void) { dc.x = 0; dc.y = 0; dc.w = mw; dc.h = mh; - drawtext(NULL, dc.norm); + drawbox(&dc, normcol); + dc.h = dc.font.height + 2; + dc.y = topbar ? 0 : mh - dc.h; /* print prompt? */ - if(promptw) { + if(prompt) { dc.w = promptw; - drawtext(prompt, dc.sel); + drawbox(&dc, selcol); + drawtext(&dc, prompt, selcol); + 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); - drawcursor(); + drawtext(&dc, text, normcol); + drawline(&dc, textnw(&dc, text, cur) + dc.h/2 - 2, 2, 1, dc.h-4, normcol); + if(lines > 0) + drawmenuv(); + else if(curr) + drawmenuh(); + commitdraw(&dc, win); +} + +void +drawmenuh(void) { + Item *i; + dc.x += cmdw; - if(curr) { - dc.w = spaceitem; - drawtext((curr && curr->left) ? "<" : NULL, dc.norm); + dc.w = textw(&dc, "<"); + drawtext(&dc, curr->left ? "<" : NULL, normcol); + dc.x += dc.w; + for(i = curr; i != next; i = i->right) { + dc.w = MIN(textw(&dc, i->text), mw / 3); + drawitem(i->text, (sel == i) ? selcol : normcol); 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 - spaceitem; - dc.w = spaceitem; - drawtext(next ? ">" : NULL, dc.norm); } - XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); - XFlush(dpy); + dc.w = textw(&dc, ">"); + dc.x = mw - dc.w; + drawtext(&dc, next ? ">" : NULL, normcol); } void drawmenuv(void) { Item *i; + XWindowAttributes wa; - 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); - } - 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); + dc.y = topbar ? dc.h : 0; + dc.w = mw - dc.x; + for(i = curr; i != next; i = i->right) { + drawitem(i->text, (sel == i) ? selcol : normcol); + dc.y += dc.h; } - XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); - XFlush(dpy); + if(!XGetWindowAttributes(dpy, win, &wa)) + eprint("cannot get window attributes"); + XMoveResizeWindow(dpy, win, wa.x, wa.y + (topbar ? 0 : wa.height - mh), mw, mh); } 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; - - if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) - eprint("error, cannot allocate color '%s'\n", colstr); - return color.pixel; -} - -Bool grabkeyboard(void) { - unsigned int len; + unsigned int n; - for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) - break; + for(n = 0; n < 1000; n++) { + if(!XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)) + return; usleep(1000); } - return len > 0; -} - -void -initfont(const char *fontstr) { - char *def, **missing; - int i, n; - - if(!fontstr || fontstr[0] == '\0') - eprint("error, cannot load font: '%s'\n", fontstr); - missing = NULL; - 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; - xfonts++; - } - } - else { - 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; + exit(EXIT_FAILURE); } void -kpress(XKeyEvent * e) { - char buf[32]; - int i, num; - unsigned int len; +keypress(XKeyEvent *e) { + 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, NULL); - 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)) + 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: + case XK_m: ksym = XK_Return; break; - case XK_u: - case XK_U: - text[0] = 0; - match(text); - drawmenu(); - 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; - match(text); - drawmenu(); - } - break; - } - } - if(CLEANMASK(e->state) & Mod1Mask) { - switch(ksym) { - default: return; - case XK_h: - ksym = XK_Left; - break; - case XK_l: - ksym = XK_Right; + case XK_k: + text[cur] = '\0'; break; - case XK_j: - ksym = XK_Next; + case XK_n: + ksym = XK_Down; break; - case XK_k: - ksym = XK_Prior; + case XK_p: + ksym = XK_Up; break; - case XK_g: - ksym = XK_Home; + case XK_u: + memmove(text, text + cur, sizeof text - cur + 1); + cur = 0; + match(); break; - case XK_G: - ksym = XK_End; + case XK_w: + if(cur == 0) + return; + i = cur; + while(i-- > 0 && text[i] == ' '); + while(i-- > 0 && text[i] != ' '); + memmove(text + i + 1, text + cur, sizeof text - cur + 1); + cur = i + 1; + match(); break; - case XK_p: + case XK_y: { 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) + char *s; + if(!(fp = fopen("sselp", "r"))) + eprint("cannot popen sselp\n"); + s = fgets(buf, sizeof buf, fp); + fclose(fp); + if(!s) return; } - len = strlen(text); - if(len && text[len-1] == '\n') - text[--len] = '\0'; - match(text); - drawmenu(); - return; + num = strlen(buf); + if(num && buf[num-1] == '\n') + buf[--num] = '\0'; + break; } } switch(ksym) { default: + num = MIN(num, sizeof text); if(num && !iscntrl((int) buf[0])) { - buf[num] = 0; - memmove(text + cursor + num, text + cursor, sizeof text - cursor); - strncpy(text + cursor, buf, sizeof text - cursor); - cursor+=num; - match(text); + memmove(text + cur + num, text + cur, sizeof text - cur - num); + memcpy(text + cur, buf, num); + cur += num; + match(); } break; case XK_BackSpace: - if(cursor > 0) { - memmove(text + cursor + -1, text + cursor, sizeof text - cursor); - cursor--; - match(text); - } + if(cur == 0) + return; + for(i = 1; len - i > 0 && !IS_UTF8_1ST_CHAR(text[cur - i]); i++); + memmove(text + cur - i, text + cur, sizeof text - cur + i); + cur -= i; + match(); break; - case XK_End: - if(!item) + case XK_Delete: + if(cur == len) return; + for(i = 1; cur + i < len && !IS_UTF8_1ST_CHAR(text[cur + i]); i++); + memmove(text + cur, text + cur + i, sizeof text - cur); + match(); + break; + case XK_End: + if(cur < len) { + cur = len; + break; + } while(next) { sel = curr = next; calcoffsets(); @@ -508,28 +356,30 @@ kpress(XKeyEvent * e) { sel = sel->right; break; case XK_Escape: - ret = 1; - running = False; - break; + exit(EXIT_FAILURE); case XK_Home: - if(!item) - return; + if(sel == item) { + cur = 0; + break; + } sel = curr = item; calcoffsets(); break; case XK_Left: - case XK_Up: - if(sel && sel->left){ - sel=sel->left; - if(sel->right == curr) { - curr = prev; - calcoffsets(); - } + if(cur > 0 && (!sel || !sel->left || lines > 0)) { + while(cur-- > 0 && !IS_UTF8_1ST_CHAR(text[cur])); + break; } - else if(cursor > 0) - cursor--; - else + if(lines > 0) + return; + case XK_Up: + if(!sel || !sel->left) return; + sel = sel->left; + if(sel->right == curr) { + curr = prev; + calcoffsets(); + } break; case XK_Next: if(!next) @@ -544,58 +394,49 @@ kpress(XKeyEvent * e) { calcoffsets(); break; case XK_Return: - if((e->state & ShiftMask) && *text) - fprintf(stdout, "%s", text); - else if(sel) - fprintf(stdout, "%s", sel->text); - else if(*text) - fprintf(stdout, "%s", text); + fprintf(stdout, "%s", ((e->state & ShiftMask) || sel) ? sel->text : text); fflush(stdout); - running = False; - break; + exit(EXIT_SUCCESS); case XK_Right: - case XK_Down: - if(cursor < len) - cursor++; - else if(sel && sel->right) { - sel=sel->right; - if(sel == next) { - curr = next; - calcoffsets(); - } + if(cur < len) { + while(cur++ < len && !IS_UTF8_1ST_CHAR(text[cur])); + break; } - else + if(lines > 0) + return; + case XK_Down: + if(!sel || !sel->right) return; + sel = sel->right; + if(sel == next) { + curr = next; + calcoffsets(); + } break; case XK_Tab: if(!sel) return; strncpy(text, sel->text, sizeof text); - cursor = strlen(text); - match(text); + cur = strlen(text); + match(); break; } - len = strlen(text); - cursor = MIN(cursor, len); - cursor = MAX(cursor, 0); drawmenu(); } void -match(char *pattern) { - unsigned int plen; +match(void) { + unsigned int len; Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; - if(!pattern) - return; - plen = strlen(pattern); + len = strlen(text); item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; for(i = allitems; i; i = i->next) - if(!fstrncmp(pattern, i->text, plen + 1)) + if(!fstrncmp(text, i->text, len + 1)) appenditem(i, &lexact, &exactend); - else if(!fstrncmp(pattern, i->text, plen)) + else if(!fstrncmp(text, i->text, len)) appenditem(i, &lprefix, &prefixend); - else if(fstrstr(i->text, pattern)) + else if(fstrstr(i->text, text)) appenditem(i, &lsubstr, &substrend); if(lexact) { item = lexact; @@ -624,23 +465,21 @@ match(char *pattern) { 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; + if(buf[len-1] == '\n') + buf[--len] = '\0'; if(!(p = strdup(buf))) - eprint("fatal: could not strdup() %u bytes\n", strlen(buf)); - if(max < len) { + eprint("cannot strdup %u bytes\n", len); + if((max = MAX(max, len)) == len) maxname = p; - max = len; - } - if(!(new = (Item *)malloc(sizeof(Item)))) - eprint("fatal: could not malloc() %u bytes\n", sizeof(Item)); + if(!(new = malloc(sizeof *new))) + eprint("cannot malloc %u bytes\n", sizeof *new); new->next = new->left = new->right = NULL; new->text = p; if(!i) @@ -655,23 +494,26 @@ 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; + XSync(dpy, False); + while(!XNextEvent(dpy, &ev)) + switch(ev.type) { case Expose: if(ev.xexpose.count == 0) drawmenu(); break; + case KeyPress: + keypress(&ev.xkey); + break; + case VisibilityNotify: + if(ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dpy, win); + break; } + exit(EXIT_FAILURE); } void -setup(Bool topbar) { +setup(void) { int i, j, x, y; #if XINERAMA int n; @@ -690,21 +532,20 @@ setup(Bool topbar) { } XFreeModifiermap(modmap); - /* style */ - dc.norm[ColBG] = getcolor(normbgcolor); - dc.norm[ColFG] = getcolor(normfgcolor); - dc.sel[ColBG] = getcolor(selbgcolor); - dc.sel[ColFG] = getcolor(selfgcolor); - initfont(font); + dc.dpy = dpy; + normcol[ColBG] = getcolor(&dc, normbgcolor); + normcol[ColFG] = getcolor(&dc, normfgcolor); + selcol[ColBG] = getcolor(&dc, selbgcolor); + selcol[ColFG] = getcolor(&dc, selfgcolor); + initfont(&dc, font); - /* menu window */ + /* input window */ wa.override_redirect = True; wa.background_pixmap = ParentRelative; - wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; + wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; - /* menu window geometry */ - mh = dc.font.height + 2; - mh = vlist ? mh * (lines+1) : mh; + /* input window geometry */ + mh = (dc.font.height + 2) * (lines + 1); #if XINERAMA if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { i = 0; @@ -735,47 +576,18 @@ setup(Bool topbar) { DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - /* pixmap */ - dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen)); - 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); - if(maxname) - cmdw = textw(maxname); - if(cmdw > mw / 3) - cmdw = mw / 3; + setupdraw(&dc, win); if(prompt) - promptw = textw(prompt); - if(promptw > mw / 5) - promptw = mw / 5; - text[0] = 0; - match(text); + promptw = MIN(textw(&dc, prompt), mw / 5); XMapRaised(dpy, win); } -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 */ + progname = "dmenu"; for(i = 1; i < argc; i++) if(!strcmp(argv[i], "-i")) { fstrncmp = strncasecmp; @@ -784,10 +596,9 @@ main(int argc, char *argv[]) { 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]); + if(++i < argc) lines = atoi(argv[i]); + if(lines > 0) + calcoffsets = calcoffsetsv; } else if(!strcmp(argv[i], "-fn")) { if(++i < argc) font = argv[i]; @@ -807,32 +618,33 @@ main(int argc, char *argv[]) { 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"); + else if(!strcmp(argv[i], "-v")) { + printf("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n"); + exit(EXIT_SUCCESS); + } + else { + fputs("usage: dmenu [-i] [-b] [-l ] [-fn ] [-nb ]\n" + " [-nf ] [-p ] [-sb ] [-sf ] [-v]\n", stderr); + exit(EXIT_FAILURE); + } if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fprintf(stderr, "warning: no locale support\n"); + fprintf(stderr, "dmenu: warning: no locale support\n"); if(!(dpy = XOpenDisplay(NULL))) - eprint("dmenu: cannot open display\n"); + eprint("cannot open display\n"); + if(atexit(&cleanup) != 0) + eprint("cannot register cleanup\n"); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); + if(!(argp = malloc(sizeof *argp * (argc+2)))) + eprint("cannot malloc %u bytes\n", sizeof *argp * (argc+2)); + memcpy(argp + 2, argv + 1, sizeof *argp * argc); - if(isatty(STDIN_FILENO)) { - readstdin(); - running = grabkeyboard(); - } - else { /* prevent keypress loss */ - running = grabkeyboard(); - readstdin(); - } - - setup(topbar); - drawmenu(); - XSync(dpy, False); + readstdin(); + grabkeyboard(); + setup(); + if(maxname) + cmdw = MIN(textw(&dc, maxname), mw / 3); + match(); run(); - cleanup(); - XCloseDisplay(dpy); - return ret; + return 0; }