X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=2193f8229b3eed41eccf3fa041ebbed6803658f9;hb=e0e6b071c63f960c398b43b2fbf0dec66a9b3ab6;hp=e48733380f3880c6a9965ecdaf1c2c3cdffd6c96;hpb=4d8a646958fa2e0c8fe9d8da3dd26357e8bb4317;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index e487333..2193f82 100644 --- a/dmenu.c +++ b/dmenu.c @@ -1,433 +1,314 @@ /* See LICENSE file for copyright and license details. */ -#define _BSD_SOURCE #include -#include -#include #include #include #include -#include #include -#include #include +#include #include #ifdef XINERAMA #include #endif +#include "draw.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)) - -/* 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) ((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)) 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 matching items */ }; -/* forward declarations */ -static void appenditem(Item *i, Item **list, Item **last); +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 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 char *fstrstr(const char *s, const char *sub); +static void grabkeyboard(void); +static void insert(const char *s, ssize_t n); +static void keypress(XKeyEvent *ev); +static void match(void); +static size_t nextrune(int incr); +static void paste(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" - -/* variables */ -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 numlockmask = 0; -static Bool running = True; -static Display *dpy; -static DC dc = {0}; -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 void setup(void); + +static char text[BUFSIZ] = ""; +static int bh, mw, mh; +static int inputw = 0; +static int lines = 0; +static int monitor = -1; +static int promptw; +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 Item *items = NULL; +static Item *matches, *sel; +static Item *prev, *curr, *next; static Window root, win; -static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp; -static char *(*fstrstr)(const char *, const char *) = strstr; -void -appenditem(Item *i, Item **list, Item **last) { - if(!(*last)) - *list = i; - else - (*last)->right = i; - i->left = *last; - i->right = NULL; - *last = i; -} +static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; -void -calcoffsets(void) { - int tw; - unsigned int w; +int +main(int argc, char *argv[]) { + Bool fast = False; + int i; - 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) - break; + progname = "dmenu"; + for(i = 1; i < argc; i++) + /* single flags */ + if(!strcmp(argv[i], "-v")) { + fputs("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details\n", stdout); + exit(EXIT_SUCCESS); + } + else if(!strcmp(argv[i], "-b")) + topbar = False; + else if(!strcmp(argv[i], "-i")) + fstrncmp = strncasecmp; + else if(!strcmp(argv[i], "-f")) + fast = True; + else if(i == argc-1) + goto usage; + /* double flags */ + else if(!strcmp(argv[i], "-l")) + lines = atoi(argv[++i]); + else if(!strcmp(argv[i], "-m")) + monitor = atoi(argv[++i]); + else if(!strcmp(argv[i], "-p")) + prompt = argv[++i]; + else if(!strcmp(argv[i], "-fn")) + font = argv[++i]; + else if(!strcmp(argv[i], "-nb")) + normbgcolor = argv[++i]; + else if(!strcmp(argv[i], "-nf")) + normfgcolor = argv[++i]; + else if(!strcmp(argv[i], "-sb")) + selbgcolor = argv[++i]; + else if(!strcmp(argv[i], "-sf")) + selfgcolor = argv[++i]; + else + goto usage; + + dc = initdc(); + initfont(dc, font); + + if(fast) { + setup(); + readstdin(); } - 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) - break; + else { + readstdin(); + setup(); } + match(); + run(); + return EXIT_FAILURE; + +usage: + fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr); + return EXIT_FAILURE; } -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 +appenditem(Item *item, Item **list, Item **last) { + if(!*last) + *list = item; + else + (*last)->right = item; + item->left = *last; + item->right = NULL; + *last = item; } 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); +calcoffsets(void) { + unsigned int i, n; + + if(lines > 0) + n = lines * bh; else - XFreeFont(dpy, dc.font.xfont); - XFreePixmap(dpy, dc.drawable); - XFreeGC(dpy, dc.gc); - XDestroyWindow(dpy, win); - XUngrabKeyboard(dpy, CurrentTime); + n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">")); + + for(i = 0, next = curr; next; next = next->right) + if((i += (lines > 0) ? bh : MIN(textw(dc, 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) + break; } void drawmenu(void) { - Item *i; - - 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); + int curpos; + Item *item; + + dc->x = 0; + dc->y = 0; + dc->h = bh; + drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); + + if(prompt) { + dc->w = promptw; + drawtext(dc, prompt, selcol); + dc->x = dc->w; } - dc.x += promptw; - dc.w = mw - promptw; - /* print command */ - if(cmdw && item) - dc.w = cmdw; - drawtext(text[0] ? text : NULL, dc.norm); - dc.x += cmdw; - if(curr) { - dc.w = spaceitem; - 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->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; + for(item = curr; item != next; item = item->right) { + dc->y += dc->h; + drawtext(dc, item->text, (item == sel) ? selcol : normcol); } - 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); -} - -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] = '.'; + else if(matches) { + dc->x += inputw; + dc->w = textw(dc, "<"); + if(curr->left) + drawtext(dc, "<", normcol); + 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); + } + dc->w = textw(dc, ">"); + dc->x = mw - dc->w; + if(next) + drawtext(dc, ">", normcol); } - 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); - 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); + mapdc(dc, win, mw, mh); } -unsigned long -getcolor(const char *colstr) { - Colormap cmap = DefaultColormap(dpy, screen); - XColor color; +char * +fstrstr(const char *s, const char *sub) { + size_t len; - if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) - eprint("error, cannot allocate color '%s'\n", colstr); - return color.pixel; + for(len = strlen(sub); *s; s++) + if(!fstrncmp(s, sub, len)) + return (char *)s; + return NULL; } -Bool +void grabkeyboard(void) { - unsigned int len; + int i; - for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) - break; + for(i = 0; i < 1000; i++) { + if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)) + return; usleep(1000); } - return len > 0; + eprintf("cannot grab keyboard\n"); } 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; - if(dc.font.set) - XFreeFontSet(dpy, dc.font.set); - 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) - XFreeFont(dpy, dc.font.xfont); - dc.font.xfont = NULL; - 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; +insert(const char *s, ssize_t n) { + if(strlen(text) + n > sizeof text - 1) + return; + memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0)); + if(n > 0) + memcpy(text + cursor, s, n); + cursor += n; + match(); } void -kpress(XKeyEvent * e) { +keypress(XKeyEvent *ev) { char buf[32]; - int i, num; - unsigned int len; + size_t 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)) - return; - /* first check if a control mask is omitted */ - if(e->state & ControlMask) { - switch (ksym) { - default: /* ignore other control sequences */ + XLookupString(ev, buf, sizeof buf, &ksym, NULL); + if(ev->state & ControlMask) + 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_d: + ksym = XK_Delete; + 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_u: - case XK_U: - text[0] = 0; - match(text); - drawmenu(); - return; - 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(); - } - return; - } - } - if(CLEANMASK(e->state) & Mod1Mask) { - switch(ksym) { - default: return; - case XK_h: - ksym = XK_Left; + case XK_k: /* delete right */ + text[cursor] = '\0'; + match(); break; - case XK_l: - ksym = XK_Right; + case XK_n: + ksym = XK_Down; break; - case XK_j: - ksym = XK_Next; - break; - case XK_k: - ksym = XK_Prior; + case XK_p: + ksym = XK_Up; break; - case XK_g: - ksym = XK_Home; + case XK_u: /* delete left */ + insert(NULL, 0 - cursor); break; - case XK_G: - ksym = XK_End; + case XK_w: /* delete word */ + while(cursor > 0 && text[nextrune(-1)] == ' ') + insert(NULL, nextrune(-1) - cursor); + while(cursor > 0 && text[nextrune(-1)] != ' ') + insert(NULL, nextrune(-1) - cursor); break; + case XK_y: /* paste selection */ + XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime); + 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); - match(text); - } + if(!iscntrl(*buf)) + insert(buf, strlen(buf)); break; + case XK_Delete: + if(cursor == len) + return; + cursor = nextrune(+1); case XK_BackSpace: - if(len) { - text[--len] = 0; - match(text); - } + if(cursor > 0) + insert(NULL, nextrune(-1) - cursor); break; case XK_End: - if(!item) - return; + if(cursor < len) { + cursor = len; + break; + } while(next) { sel = curr = next; calcoffsets(); @@ -436,20 +317,24 @@ kpress(XKeyEvent * e) { sel = sel->right; break; case XK_Escape: - ret = 1; - running = False; - break; + exit(EXIT_FAILURE); case XK_Home: - if(!item) - return; - sel = curr = item; + if(sel == matches) { + cursor = 0; + break; + } + sel = curr = matches; calcoffsets(); break; case XK_Left: - if(!(sel && sel->left)) + if(cursor > 0 && (!sel || !sel->left || lines > 0)) { + cursor = nextrune(-1); + break; + } + else if(lines > 0) return; - sel=sel->left; - if(sel->right == curr) { + case XK_Up: + if(sel && sel->left && (sel = sel->left)->right == curr) { curr = prev; calcoffsets(); } @@ -467,20 +352,18 @@ 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); - fflush(stdout); - running = False; - break; + case XK_KP_Enter: + fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout); + exit(EXIT_SUCCESS); case XK_Right: - if(!(sel && sel->right)) + if(cursor < len) { + cursor = nextrune(+1); + break; + } + else if(lines > 0) return; - sel=sel->right; - if(sel == next) { + case XK_Down: + if(sel && sel->right && (sel = sel->right) == next) { curr = next; calcoffsets(); } @@ -489,30 +372,30 @@ kpress(XKeyEvent * e) { if(!sel) return; strncpy(text, sel->text, sizeof text); - match(text); + cursor = strlen(text); + match(); break; } drawmenu(); } void -match(char *pattern) { - unsigned int plen; - Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; +match(void) { + size_t len; + Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; + + len = strlen(text); + matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; + for(item = items; item; item = item->next) + if(!fstrncmp(text, item->text, len + 1)) + appenditem(item, &lexact, &exactend); + else if(!fstrncmp(text, item->text, len)) + appenditem(item, &lprefix, &prefixend); + else if(fstrstr(item->text, text)) + appenditem(item, &lsubstr, &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; + matches = lexact; itemend = exactend; } if(lprefix) { @@ -521,7 +404,7 @@ match(char *pattern) { lprefix->left = itemend; } else - item = lprefix; + matches = lprefix; itemend = prefixend; } if(lsubstr) { @@ -530,38 +413,48 @@ match(char *pattern) { lsubstr->left = itemend; } else - item = lsubstr; + matches = lsubstr; } - curr = prev = next = sel = item; + curr = sel = matches; calcoffsets(); } +size_t +nextrune(int incr) { + size_t n, len; + + len = strlen(text); + for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr); + return n; +} + +void +paste(void) { + char *p, *q; + int di; + unsigned long dl; + Atom da; + + XGetWindowProperty(dc->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 : strlen(p)); + XFree(p); + drawmenu(); +} + void readstdin(void) { - char *p, buf[1024]; - unsigned int len = 0, max = 0; - Item *i, *new; - - i = 0; - while(fgets(buf, sizeof buf, stdin)) { - len = strlen(buf); - if (buf[len - 1] == '\n') - buf[len - 1] = 0; - if(!(p = strdup(buf))) - eprint("fatal: could not strdup() %u bytes\n", strlen(buf)); - if(max < len) { - maxname = p; - max = len; - } - if((new = (Item *)malloc(sizeof(Item))) == NULL) - eprint("fatal: could not malloc() %u bytes\n", sizeof(Item)); - new->next = new->left = new->right = NULL; - new->text = p; - if(!i) - allitems = new; - else - i->next = new; - i = new; + char buf[sizeof text], *p; + Item *item, **end; + + for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) { + if((p = strchr(buf, '\n'))) + *p = '\0'; + if(!(item = calloc(1, sizeof *item))) + eprintf("cannot malloc %u bytes:", sizeof *item); + if(!(item->text = strdup(buf))) + eprintf("cannot strdup %u bytes:", strlen(buf)+1); + inputw = MAX(inputw, textw(dc, item->text)); } } @@ -569,69 +462,61 @@ 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; + while(!XNextEvent(dc->dpy, &ev)) + switch(ev.type) { case Expose: if(ev.xexpose.count == 0) drawmenu(); break; + case KeyPress: + keypress(&ev.xkey); + break; + case SelectionNotify: + if(ev.xselection.property == utf8) + paste(); + break; + case VisibilityNotify: + if(ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dc->dpy, win); + break; } } void -setup(Bool topbar) { - int i, j, n, x, y; - XModifierKeymap *modmap; +setup(void) { + int x, y, screen; XSetWindowAttributes wa; -#if XINERAMA - XineramaScreenInfo *info = NULL; +#ifdef XINERAMA + int n; + XineramaScreenInfo *info; #endif - /* init modifier map */ - modmap = XGetModifierMapping(dpy); - 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); + screen = DefaultScreen(dc->dpy); + root = RootWindow(dc->dpy, screen); + utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); - /* style */ - dc.norm[ColBG] = getcolor(normbgcolor); - dc.norm[ColFG] = getcolor(normfgcolor); - dc.sel[ColBG] = getcolor(selbgcolor); - dc.sel[ColFG] = getcolor(selfgcolor); - initfont(font); + normcol[ColBG] = getcolor(dc, normbgcolor); + normcol[ColFG] = getcolor(dc, normfgcolor); + selcol[ColBG] = getcolor(dc, selbgcolor); + selcol[ColFG] = getcolor(dc, selfgcolor); - /* menu window */ - wa.override_redirect = 1; - wa.background_pixmap = ParentRelative; - wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; - - /* menu window geometry */ - mh = dc.font.height + 2; -#if XINERAMA - if(XineramaIsActive(dpy)) { - i = 0; - info = XineramaQueryScreens(dpy, &n); - 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; - } + /* menu geometry */ + bh = dc->font.height + 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; i++) + if((monitor == info[i].screen_number) + || (monitor < 0 && 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; + y = info[i].y_org + (topbar ? 0 : info[i].height - mh); mw = info[i].width; XFree(info); } @@ -639,107 +524,21 @@ setup(Bool topbar) { #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); - 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; - if(prompt) - promptw = textw(prompt); - if(promptw > mw / 5) - promptw = mw / 5; - text[0] = 0; - match(text); - 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 */ - 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], "-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-2008 dmenu engineers, see LICENSE for details\n"); - else - eprint("usage: dmenu [-i] [-b] [-fn ] [-nb ] [-nf ]\n" - " [-p ] [-sb ] [-sf ] [-v]\n"); - if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fprintf(stderr, "warning: no locale support\n"); - if(!(dpy = XOpenDisplay(0))) - eprint("dmenu: cannot open display\n"); - screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); - - if(isatty(STDIN_FILENO)) { - readstdin(); - running = grabkeyboard(); + y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh; + mw = DisplayWidth(dc->dpy, screen); } - else { /* prevent keypress loss */ - running = grabkeyboard(); - readstdin(); - } - - setup(topbar); - drawmenu(); - XSync(dpy, False); - run(); - cleanup(); - XCloseDisplay(dpy); - return ret; + /* 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); + + grabkeyboard(); + resizedc(dc, mw, mh); + inputw = MIN(inputw, mw/3); + promptw = prompt ? textw(dc, prompt) : 0; + XMapRaised(dc->dpy, win); }