X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/7cf66b443ad1cc9a698db477401b843f3c14184b..210b303941e517a9d7df1cba1e3229165fb4037b:/dmenu.c?ds=sidebyside diff --git a/dmenu.c b/dmenu.c index f0be02a..d8ef88f 100644 --- a/dmenu.c +++ b/dmenu.c @@ -10,7 +10,7 @@ #ifdef XINERAMA #include #endif -#include +#include "draw.h" #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)) @@ -36,9 +36,8 @@ static void paste(void); static void readstdin(void); static void run(void); static void setup(void); -static void usage(void); -static char text[BUFSIZ]; +static char text[BUFSIZ] = ""; static int bh, mw, mh; static int inputw = 0; static int lines = 0; @@ -63,6 +62,56 @@ static Window root, win; static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; +int +main(int argc, char *argv[]) { + int i; + + 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(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); + readstdin(); + setup(); + run(); + return EXIT_FAILURE; + +usage: + fputs("usage: dmenu [-b] [-i] [-l lines] [-m monitor] [-p prompt] [-fn font]\n" + " [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr); + return EXIT_FAILURE; +} + void appenditem(Item *item, Item **list, Item **last) { if(!*last) @@ -81,13 +130,13 @@ calcoffsets(void) { if(lines > 0) n = lines * bh; else - n = mw - (promptw + inputw + dc_textw(dc, "<") + dc_textw(dc, ">")); + n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">")); for(i = 0, next = curr; next; next = next->right) - if((i += (lines > 0) ? bh : MIN(dc_textw(dc, next->text), n)) > n) + 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(dc_textw(dc, prev->left->text), n)) > n) + if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n) break; } @@ -99,41 +148,41 @@ drawmenu(void) { dc->x = 0; dc->y = 0; dc->h = bh; - dc_drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); + drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol)); if(prompt) { dc->w = promptw; - dc_drawtext(dc, prompt, selcol); + drawtext(dc, prompt, selcol); dc->x = dc->w; } dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw; - dc_drawtext(dc, text, normcol); - if((curpos = dc_textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w) - dc_drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol)); + 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; - dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol); + drawtext(dc, item->text, (item == sel) ? selcol : normcol); } } else if(matches) { dc->x += inputw; - dc->w = dc_textw(dc, "<"); + dc->w = textw(dc, "<"); if(curr->left) - dc_drawtext(dc, "<", normcol); + drawtext(dc, "<", normcol); for(item = curr; item != next; item = item->right) { dc->x += dc->w; - dc->w = MIN(dc_textw(dc, item->text), mw - dc->x - dc_textw(dc, ">")); - dc_drawtext(dc, item->text, (item == sel) ? selcol : normcol); + dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">")); + drawtext(dc, item->text, (item == sel) ? selcol : normcol); } - dc->w = dc_textw(dc, ">"); + dc->w = textw(dc, ">"); dc->x = mw - dc->w; if(next) - dc_drawtext(dc, ">", normcol); + drawtext(dc, ">", normcol); } - dc_map(dc, win, mw, mh); + mapdc(dc, win, mw, mh); } char * @@ -177,7 +226,7 @@ keypress(XKeyEvent *ev) { len = strlen(text); XLookupString(ev, buf, sizeof buf, &ksym, NULL); - if(ev->state & ControlMask) { + if(ev->state & ControlMask) switch(tolower(ksym)) { default: return; @@ -227,8 +276,10 @@ keypress(XKeyEvent *ev) { 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(!iscntrl(*buf)) @@ -264,10 +315,6 @@ keypress(XKeyEvent *ev) { sel = curr = matches; calcoffsets(); break; - case XK_Insert: /* paste selection */ - if(ev->state & ShiftMask) - XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime); - return; case XK_Left: if(cursor > 0 && (!sel || !sel->left || lines > 0)) { cursor = nextrune(-1); @@ -296,7 +343,6 @@ keypress(XKeyEvent *ev) { case XK_Return: case XK_KP_Enter: fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout); - fflush(stdout); exit(EXIT_SUCCESS); case XK_Right: if(cursor < len) { @@ -358,7 +404,7 @@ match(void) { else matches = lsubstr; } - curr = prev = next = sel = matches; + curr = sel = matches; calcoffsets(); } @@ -393,12 +439,11 @@ readstdin(void) { for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) { if((p = strchr(buf, '\n'))) *p = '\0'; - if(!(item = malloc(sizeof *item))) + if(!(item = calloc(1, sizeof *item))) eprintf("cannot malloc %u bytes\n", sizeof *item); if(!(item->text = strdup(buf))) eprintf("cannot strdup %u bytes\n", strlen(buf)+1); - item->next = item->left = item->right = NULL; - inputw = MAX(inputw, dc_textw(dc, item->text)); + inputw = MAX(inputw, textw(dc, item->text)); } } @@ -439,10 +484,10 @@ setup(void) { root = RootWindow(dc->dpy, screen); utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False); - normcol[ColBG] = dc_color(dc, normbgcolor); - normcol[ColFG] = dc_color(dc, normfgcolor); - selcol[ColBG] = dc_color(dc, selbgcolor); - selcol[ColFG] = dc_color(dc, selfgcolor); + normcol[ColBG] = getcolor(dc, normbgcolor); + normcol[ColFG] = getcolor(dc, normfgcolor); + selcol[ColBG] = getcolor(dc, selbgcolor); + selcol[ColFG] = getcolor(dc, selfgcolor); /* menu geometry */ bh = dc->font.height + 2; @@ -481,63 +526,9 @@ setup(void) { CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); grabkeyboard(); - dc_resize(dc, mw, mh); + resizedc(dc, mw, mh); inputw = MIN(inputw, mw/3); - promptw = prompt ? dc_textw(dc, prompt) : 0; + promptw = prompt ? textw(dc, prompt) : 0; XMapRaised(dc->dpy, win); - text[0] = '\0'; match(); } - -void -usage(void) { - fputs("usage: dmenu [-b] [-i] [-l lines] [-p prompt] [-fn font] [-nb color]\n" - " [-nf color] [-sb color] [-sf color] [-v]\n", stderr); - exit(EXIT_FAILURE); -} - -int -main(int argc, char *argv[]) { - int i; - - progname = "dmenu"; - for(i = 1; i < argc; i++) - /* single flags */ - if(!strcmp(argv[i], "-v")) { - fputs("dmenu-"VERSION", © 2006-2010 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(i == argc-1) - 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 - usage(); - - dc = dc_init(); - dc_font(dc, font); - readstdin(); - setup(); - run(); - - return EXIT_FAILURE; /* should not reach */ -}