X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=dmenu.c;h=f0bc1769f32e5540d1678196cceaee8432dddb97;hb=2d2175ff6f67e2bc85138d3f359d2f7580bcb754;hp=fd98d54340553f0f909af9fd2fb7c3e2a5a60353;hpb=1636e122101501ddb907119c61d0961ccaa89a99;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index fd98d54..f0bc176 100644 --- a/dmenu.c +++ b/dmenu.c @@ -1,5 +1,6 @@ /* See LICENSE file for copyright and license details. */ #include +#include #include #include #include @@ -11,26 +12,37 @@ #ifdef XINERAMA #include #endif -#include "draw.h" +#include -#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)) +#include "drw.h" +#include "util.h" + +/* macros */ +#define INTERSECT(x,y,w,h,r) (MAX(0, MIN((x)+(w),(r).x_org+(r).width) - MAX((x),(r).x_org)) \ + * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org))) +#define LENGTH(X) (sizeof X / sizeof X[0]) +#define TEXTNW(X,N) (drw_font_getexts_width(drw->fonts[0], (X), (N))) +#define TEXTW(X) (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h) + +/* enums */ +enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */ typedef struct Item Item; struct Item { char *text; Item *left, *right; + Bool out; }; static void appenditem(Item *item, Item **list, Item **last); static void calcoffsets(void); static char *cistrstr(const char *s, const char *sub); +static void cleanup(void); static void drawmenu(void); static void grabkeyboard(void); static void insert(const char *str, ssize_t n); static void keypress(XKeyEvent *ev); -static void match(Bool sub); +static void match(void); static size_t nextrune(int inc); static void paste(void); static void readstdin(void); @@ -41,23 +53,23 @@ static void usage(void); static char text[BUFSIZ] = ""; static int bh, mw, mh; static int inputw, promptw; -static int lines = 0; static size_t cursor = 0; -static const char *font = NULL; -static const char *prompt = NULL; -static const char *normbgcolor = "#cccccc"; -static const char *normfgcolor = "#000000"; -static const char *selbgcolor = "#0066ff"; -static const char *selfgcolor = "#ffffff"; -static unsigned long normcol[ColLast]; -static unsigned long selcol[ColLast]; -static Atom utf8; -static Bool topbar = True; -static DC *dc; +static Atom clip, utf8; static Item *items = NULL; static Item *matches, *matchend; static Item *prev, *curr, *next, *sel; static Window win; +static XIC xic; +static int mon = -1; + +static ClrScheme scheme[SchemeLast]; +static Display *dpy; +static int screen; +static Window root; +static Drw *drw; +static int sw, sh; /* X display screen geometry width, height */ + +#include "config.h" static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; static char *(*fstrstr)(const char *, const char *) = strstr; @@ -68,41 +80,54 @@ main(int argc, char *argv[]) { int i; for(i = 1; i < argc; i++) - /* single flags */ - if(!strcmp(argv[i], "-v")) { - puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details"); - exit(EXIT_SUCCESS); + /* these options take no arguments */ + if(!strcmp(argv[i], "-v")) { /* prints version information */ + puts("dmenu-"VERSION", © 2006-2015 dmenu engineers, see LICENSE for details"); + exit(0); } - else if(!strcmp(argv[i], "-b")) + else if(!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */ topbar = False; - else if(!strcmp(argv[i], "-f")) + else if(!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */ fast = True; - else if(!strcmp(argv[i], "-i")) { + else if(!strcmp(argv[i], "-i")) { /* case-insensitive item matching */ fstrncmp = strncasecmp; fstrstr = cistrstr; } else if(i+1 == argc) usage(); - /* double flags */ - else if(!strcmp(argv[i], "-l")) + /* these options take one argument */ + else if(!strcmp(argv[i], "-l")) /* number of lines in vertical list */ lines = atoi(argv[++i]); - else if(!strcmp(argv[i], "-p")) + else if(!strcmp(argv[i], "-m")) + mon = atoi(argv[++i]); + else if(!strcmp(argv[i], "-p")) /* adds prompt to left of input field */ prompt = argv[++i]; - else if(!strcmp(argv[i], "-fn")) - font = argv[++i]; - else if(!strcmp(argv[i], "-nb")) + else if(!strcmp(argv[i], "-fn")) /* font or font set */ + fonts[0] = argv[++i]; + else if(!strcmp(argv[i], "-nb")) /* normal background color */ normbgcolor = argv[++i]; - else if(!strcmp(argv[i], "-nf")) + else if(!strcmp(argv[i], "-nf")) /* normal foreground color */ normfgcolor = argv[++i]; - else if(!strcmp(argv[i], "-sb")) + else if(!strcmp(argv[i], "-sb")) /* selected background color */ selbgcolor = argv[++i]; - else if(!strcmp(argv[i], "-sf")) + else if(!strcmp(argv[i], "-sf")) /* selected foreground color */ selfgcolor = argv[++i]; else usage(); - dc = initdc(); - initfont(dc, font); + if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) + fputs("warning: no locale support\n", stderr); + if(!(dpy = XOpenDisplay(NULL))) + die("dmenu: cannot open display\n"); + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + sw = DisplayWidth(dpy, screen); + sh = DisplayHeight(dpy, screen); + drw = drw_create(dpy, screen, root, sw, sh); + drw_load_fonts(drw, fonts, LENGTH(fonts)); + if(!drw->fontcount) + die("No fonts could be loaded.\n"); + drw_setscheme(drw, &scheme[SchemeNorm]); if(fast) { grabkeyboard(); @@ -115,15 +140,15 @@ main(int argc, char *argv[]) { setup(); run(); - return EXIT_FAILURE; /* unreachable */ + return 1; /* unreachable */ } void appenditem(Item *item, Item **list, Item **last) { - if(!*last) - *list = item; - else + if(*last) (*last)->right = item; + else + *list = item; item->left = *last; item->right = NULL; @@ -137,16 +162,30 @@ calcoffsets(void) { if(lines > 0) n = lines * bh; else - n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">")); - + n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">")); + /* calculate which items will begin the next page and previous page */ for(i = 0, next = curr; next; next = next->right) - if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n) + if((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n) break; for(i = 0, prev = curr; prev && prev->left; prev = prev->left) - if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n) + if((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n) break; } +void +cleanup(void) { + XUngrabKey(dpy, AnyKey, AnyModifier, root); + drw_clr_free(scheme[SchemeNorm].bg); + drw_clr_free(scheme[SchemeNorm].fg); + drw_clr_free(scheme[SchemeSel].fg); + drw_clr_free(scheme[SchemeSel].bg); + drw_clr_free(scheme[SchemeOut].fg); + drw_clr_free(scheme[SchemeOut].bg); + drw_free(drw); + XSync(dpy, False); + XCloseDisplay(dpy); +} + char * cistrstr(const char *s, const char *sub) { size_t len; @@ -161,98 +200,128 @@ void drawmenu(void) { int curpos; Item *item; + int x = 0, y = 0, h = bh, w; - dc->x = 0; - dc->y = 0; - dc->h = bh; - drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); + drw_setscheme(drw, &scheme[SchemeNorm]); + drw_rect(drw, 0, 0, mw, mh, True, 1, 1); - if(prompt) { - dc->w = promptw; - drawtext(dc, prompt, selcol); - dc->x = dc->w; + if(prompt && *prompt) { + drw_setscheme(drw, &scheme[SchemeSel]); + drw_text(drw, x, 0, promptw, bh, prompt, 0); + x += promptw; + } + /* draw input field */ + w = (lines > 0 || !matches) ? mw - x : inputw; + drw_setscheme(drw, &scheme[SchemeNorm]); + drw_text(drw, x, 0, w, bh, text, 0); + + if((curpos = TEXTNW(text, cursor) + bh/2 - 2) < w) { + drw_setscheme(drw, &scheme[SchemeNorm]); + drw_rect(drw, x + curpos + 2, 2, 1, bh - 4, 1, 1, 0); } - dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; - drawtext(dc, text, normcol); - if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w) - drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol)); if(lines > 0) { - dc->w = mw - dc->x; + /* draw vertical list */ + w = mw - x; for(item = curr; item != next; item = item->right) { - dc->y += dc->h; - drawtext(dc, item->text, (item == sel) ? selcol : normcol); + y += h; + if(item == sel) + drw_setscheme(drw, &scheme[SchemeSel]); + else if(item->out) + drw_setscheme(drw, &scheme[SchemeOut]); + else + drw_setscheme(drw, &scheme[SchemeNorm]); + + drw_text(drw, x, y, w, bh, item->text, 0); } } else if(matches) { - dc->x += inputw; - dc->w = textw(dc, "<"); - if(curr->left) - drawtext(dc, "<", normcol); + /* draw horizontal list */ + x += inputw; + w = TEXTW("<"); + if(curr->left) { + drw_setscheme(drw, &scheme[SchemeNorm]); + drw_text(drw, x, 0, w, bh, "<", 0); + } for(item = curr; item != next; item = item->right) { - dc->x += dc->w; - dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">")); - drawtext(dc, item->text, (item == sel) ? selcol : normcol); + x += w; + w = MIN(TEXTW(item->text), mw - x - TEXTW(">")); + + if(item == sel) + drw_setscheme(drw, &scheme[SchemeSel]); + else if(item->out) + drw_setscheme(drw, &scheme[SchemeOut]); + else + drw_setscheme(drw, &scheme[SchemeNorm]); + drw_text(drw, x, 0, w, bh, item->text, 0); + } + w = TEXTW(">"); + x = mw - w; + if(next) { + drw_setscheme(drw, &scheme[SchemeNorm]); + drw_text(drw, x, 0, w, bh, ">", 0); } - dc->w = textw(dc, ">"); - dc->x = mw - dc->w; - if(next) - drawtext(dc, ">", normcol); } - mapdc(dc, win, mw, mh); + drw_map(drw, win, 0, 0, mw, mh); } void grabkeyboard(void) { int i; + /* try to grab keyboard, we may have to wait for another process to ungrab */ for(i = 0; i < 1000; i++) { - if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True, + if(XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) return; usleep(1000); } - eprintf("cannot grab keyboard\n"); + die("cannot grab keyboard\n"); } void insert(const char *str, ssize_t n) { if(strlen(text) + n > sizeof text - 1) return; + /* move existing text out of the way, insert new text, and update cursor */ memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0)); if(n > 0) memcpy(&text[cursor], str, n); cursor += n; - match(n > 0 && text[cursor] == '\0'); + match(); } void keypress(XKeyEvent *ev) { char buf[32]; - KeySym ksym; + int len; + KeySym ksym = NoSymbol; + Status status; - XLookupString(ev, buf, sizeof buf, &ksym, NULL); - if(ev->state & ControlMask) { - KeySym lower, upper; - - XConvertCase(ksym, &lower, &upper); - switch(lower) { + len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status); + if(status == XBufferOverflow) + return; + if(ev->state & ControlMask) + switch(ksym) { case XK_a: ksym = XK_Home; break; case XK_b: ksym = XK_Left; break; case XK_c: ksym = XK_Escape; break; case XK_d: ksym = XK_Delete; break; case XK_e: ksym = XK_End; break; case XK_f: ksym = XK_Right; break; + case XK_g: ksym = XK_Escape; break; case XK_h: ksym = XK_BackSpace; break; case XK_i: ksym = XK_Tab; break; - case XK_j: ksym = XK_Return; break; - case XK_m: ksym = XK_Return; break; - case XK_n: ksym = XK_Up; break; - case XK_p: ksym = XK_Down; break; + case XK_j: /* fallthrough */ + case XK_J: /* fallthrough */ + case XK_m: /* fallthrough */ + case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break; + case XK_n: ksym = XK_Down; break; + case XK_p: ksym = XK_Up; break; case XK_k: /* delete right */ text[cursor] = '\0'; - match(False); + match(); break; case XK_u: /* delete left */ insert(NULL, 0 - cursor); @@ -264,16 +333,33 @@ keypress(XKeyEvent *ev) { insert(NULL, nextrune(-1) - cursor); break; case XK_y: /* paste selection */ - XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime); + XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, + utf8, utf8, win, CurrentTime); return; + case XK_Return: + case XK_KP_Enter: + break; + case XK_bracketleft: + cleanup(); + exit(1); + default: + return; + } + else if(ev->state & Mod1Mask) + switch(ksym) { + case XK_g: ksym = XK_Home; break; + case XK_G: ksym = XK_End; break; + case XK_h: ksym = XK_Up; break; + case XK_j: ksym = XK_Next; break; + case XK_k: ksym = XK_Prior; break; + case XK_l: ksym = XK_Down; break; default: return; } - } switch(ksym) { default: if(!iscntrl(*buf)) - insert(buf, strlen(buf)); + insert(buf, len); break; case XK_Delete: if(text[cursor] == '\0') @@ -291,6 +377,7 @@ keypress(XKeyEvent *ev) { break; } if(next) { + /* jump to end of list and position items in reverse */ curr = matchend; calcoffsets(); curr = prev; @@ -301,7 +388,8 @@ keypress(XKeyEvent *ev) { sel = matchend; break; case XK_Escape: - exit(EXIT_FAILURE); + cleanup(); + exit(1); case XK_Home: if(sel == matches) { cursor = 0; @@ -315,6 +403,8 @@ keypress(XKeyEvent *ev) { cursor = nextrune(-1); break; } + if(lines > 0) + return; /* fallthrough */ case XK_Up: if(sel && sel->left && (sel = sel->left)->right == curr) { @@ -337,12 +427,20 @@ keypress(XKeyEvent *ev) { case XK_Return: case XK_KP_Enter: puts((sel && !(ev->state & ShiftMask)) ? sel->text : text); - exit(EXIT_SUCCESS); + if(!(ev->state & ControlMask)) { + cleanup(); + exit(0); + } + if(sel) + sel->out = True; + break; case XK_Right: if(text[cursor] != '\0') { cursor = nextrune(+1); break; } + if(lines > 0) + return; /* fallthrough */ case XK_Down: if(sel && sel->right && (sel = sel->right) == next) { @@ -353,35 +451,49 @@ keypress(XKeyEvent *ev) { case XK_Tab: if(!sel) return; - strncpy(text, sel->text, sizeof text); + strncpy(text, sel->text, sizeof text - 1); + text[sizeof text - 1] = '\0'; cursor = strlen(text); - match(True); + match(); break; } drawmenu(); } void -match(Bool sub) { - size_t len = strlen(text); - Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; - Item *item, *lnext; - - lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL; - for(item = sub ? matches : items; item && item->text; item = lnext) { - lnext = sub ? item->right : item + 1; - if(!fstrncmp(text, item->text, len + 1)) - appenditem(item, &lexact, &exactend); - else if(!fstrncmp(text, item->text, len)) +match(void) { + static char **tokv = NULL; + static int tokn = 0; + + char buf[sizeof text], *s; + int i, tokc = 0; + size_t len; + Item *item, *lprefix, *lsubstr, *prefixend, *substrend; + + strcpy(buf, text); + /* separate input text into tokens to be matched individually */ + for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " ")) + if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv))) + die("cannot realloc %u bytes\n", tokn * sizeof *tokv); + len = tokc ? strlen(tokv[0]) : 0; + + matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL; + for(item = items; item && item->text; item++) { + for(i = 0; i < tokc; i++) + if(!fstrstr(item->text, tokv[i])) + break; + if(i != tokc) /* not all tokens match */ + continue; + /* exact matches go first, then prefixes, then substrings */ + if(!tokc || !fstrncmp(tokv[0], item->text, len+1)) + appenditem(item, &matches, &matchend); + else if(!fstrncmp(tokv[0], item->text, len)) appenditem(item, &lprefix, &prefixend); - else if(fstrstr(item->text, text)) + else appenditem(item, &lsubstr, &substrend); } - matches = lexact; - matchend = exactend; - if(lprefix) { - if(matchend) { + if(matches) { matchend->right = lprefix; lprefix->left = matchend; } @@ -390,7 +502,7 @@ match(Bool sub) { matchend = prefixend; } if(lsubstr) { - if(matchend) { + if(matches) { matchend->right = lsubstr; lsubstr->left = matchend; } @@ -406,6 +518,7 @@ size_t nextrune(int inc) { ssize_t n; + /* return location of next utf8 rune in the given direction (+1 or -1) */ for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc); return n; } @@ -417,7 +530,8 @@ paste(void) { unsigned long dl; Atom da; - XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False, + /* we have been given the current selection, now insert it into input */ + XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, utf8, &da, &di, &dl, &dl, (unsigned char **)&p); insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p)); XFree(p); @@ -429,31 +543,36 @@ readstdin(void) { char buf[sizeof text], *p, *maxstr = NULL; size_t i, max = 0, size = 0; + /* read each line from stdin and add it to the item list */ for(i = 0; fgets(buf, sizeof buf, stdin); i++) { if(i+1 >= size / sizeof *items) if(!(items = realloc(items, (size += BUFSIZ)))) - eprintf("cannot realloc %u bytes:", size); + die("cannot realloc %u bytes:", size); if((p = strchr(buf, '\n'))) *p = '\0'; if(!(items[i].text = strdup(buf))) - eprintf("cannot strdup %u bytes:", strlen(buf)+1); + die("cannot strdup %u bytes:", strlen(buf)+1); + items[i].out = False; if(strlen(items[i].text) > max) max = strlen(maxstr = items[i].text); } if(items) items[i].text = NULL; - inputw = maxstr ? textw(dc, maxstr) : 0; + inputw = maxstr ? TEXTW(maxstr) : 0; + lines = MIN(lines, i); } void run(void) { XEvent ev; - while(!XNextEvent(dc->dpy, &ev)) + while(!XNextEvent(dpy, &ev)) { + if(XFilterEvent(&ev, win)) + continue; switch(ev.type) { case Expose: if(ev.xexpose.count == 0) - mapdc(dc, win, mw, mh); + drw_map(drw, win, 0, 0, mw, mh); break; case KeyPress: keypress(&ev.xkey); @@ -464,42 +583,65 @@ run(void) { break; case VisibilityNotify: if(ev.xvisibility.state != VisibilityUnobscured) - XRaiseWindow(dc->dpy, win); + XRaiseWindow(dpy, win); break; } + } } void setup(void) { - int x, y, screen = DefaultScreen(dc->dpy); - Window root = RootWindow(dc->dpy, screen); - XSetWindowAttributes wa; + int x, y; + XSetWindowAttributes swa; + XIM xim; #ifdef XINERAMA - int n; XineramaScreenInfo *info; + Window w, pw, dw, *dws; + XWindowAttributes wa; + int a, j, di, n, i = 0, area = 0; + unsigned int du; #endif - normcol[ColBG] = getcolor(dc, normbgcolor); - normcol[ColFG] = getcolor(dc, normfgcolor); - selcol[ColBG] = getcolor(dc, selbgcolor); - selcol[ColFG] = getcolor(dc, selfgcolor); + /* init appearance */ + scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor); + scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor); + scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor); + scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor); + scheme[SchemeOut].bg = drw_clr_create(drw, outbgcolor); + scheme[SchemeOut].fg = drw_clr_create(drw, outfgcolor); - utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); + clip = XInternAtom(dpy, "CLIPBOARD", False); + utf8 = XInternAtom(dpy, "UTF8_STRING", False); - /* menu geometry */ - bh = dc->font.height + 2; + /* calculate menu geometry */ + bh = drw->fonts[0]->h + 2; lines = MAX(lines, 0); mh = (lines + 1) * bh; #ifdef XINERAMA - if((info = XineramaQueryScreens(dc->dpy, &n))) { - int i, di; - unsigned int du; - Window dw; - - XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du); - for(i = 0; i < n-1; i++) - if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) - break; + if((info = XineramaQueryScreens(dpy, &n))) { + XGetInputFocus(dpy, &w, &di); + if(mon != -1 && mon < n) + i = mon; + if(!i && w != root && w != PointerRoot && w != None) { + /* find top-level window containing current input focus */ + do { + if(XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws) + XFree(dws); + } while(w != root && w != pw); + /* find xinerama screen with which the window intersects most */ + if(XGetWindowAttributes(dpy, pw, &wa)) + for(j = 0; j < n; j++) + if((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) { + area = a; + i = j; + } + } + /* no focused window is on screen, so use pointer location instead */ + if(mon == -1 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du)) + for(i = 0; i < n; i++) + if(INTERSECT(x, y, 1, 1, info[i])) + break; + x = info[i].x_org; y = info[i].y_org + (topbar ? 0 : info[i].height - mh); mw = info[i].width; @@ -509,30 +651,35 @@ setup(void) { #endif { x = 0; - y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh; - mw = DisplayWidth(dc->dpy, screen); + y = topbar ? 0 : sh - mh; + mw = sw; } - promptw = prompt ? textw(dc, prompt) : 0; + promptw = (prompt && *prompt) ? TEXTW(prompt) : 0; inputw = MIN(inputw, mw/3); - match(False); - - /* menu window */ - wa.override_redirect = True; - wa.background_pixmap = ParentRelative; - wa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; - win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0, - DefaultDepth(dc->dpy, screen), CopyFromParent, - DefaultVisual(dc->dpy, screen), - CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); - - XMapRaised(dc->dpy, win); - resizedc(dc, mw, mh); + match(); + + /* create menu window */ + swa.override_redirect = True; + swa.background_pixel = scheme[SchemeNorm].bg->pix; + swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask; + win = XCreateWindow(dpy, root, x, y, mw, mh, 0, + DefaultDepth(dpy, screen), CopyFromParent, + DefaultVisual(dpy, screen), + CWOverrideRedirect | CWBackPixel | CWEventMask, &swa); + + /* open input methods */ + xim = XOpenIM(dpy, NULL, NULL, NULL); + xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing, + XNClientWindow, win, XNFocusWindow, win, NULL); + + XMapRaised(dpy, win); + drw_resize(drw, mw, mh); drawmenu(); } void usage(void) { - fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n" + fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr); - exit(EXIT_FAILURE); + exit(1); }