X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=a24dfe3bd0f083aa3d5d568e0c50445b9e02852e;hb=8d9ade36de4666835e49fe4366ff04cfe540dce6;hp=42022e946408ecc80d4696ff3eb05d0c87867b4d;hpb=00a60cb7b28b671ae0ba5302e3fb1cbaea6695ec;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 42022e9..a24dfe3 100644 --- a/dmenu.c +++ b/dmenu.c @@ -10,12 +10,11 @@ #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)) #define MAX(a,b) ((a) > (b) ? (a) : (b)) -#define UTF8_CODEPOINT(c) (((c) & 0xc0) != 0x80) typedef struct Item Item; struct Item { @@ -32,6 +31,7 @@ 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); @@ -39,6 +39,11 @@ static void setup(void); static void usage(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; @@ -46,10 +51,6 @@ static const char *normbgcolor = "#cccccc"; static const char *normfgcolor = "#000000"; static const char *selbgcolor = "#0066ff"; static const char *selfgcolor = "#ffffff"; -static unsigned int bh, mw, mh; -static unsigned int inputw = 0; -static unsigned int lines = 0; -static unsigned int promptw; static unsigned long normcol[ColLast]; static unsigned long selcol[ColLast]; static Atom utf8; @@ -62,6 +63,52 @@ 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-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 = initdc(); + initfont(dc, font); + readstdin(); + setup(); + run(); + + return EXIT_FAILURE; /* should not reach */ +} + void appenditem(Item *item, Item **list, Item **last) { if(!*last) @@ -83,10 +130,10 @@ calcoffsets(void) { 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), mw/3)) > 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(textw(dc, prev->left->text), mw/3)) > n) + if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n) break; } @@ -124,7 +171,7 @@ drawmenu(void) { drawtext(dc, "<", normcol); for(item = curr; item != next; item = item->right) { dc->x += dc->w; - dc->w = MIN(textw(dc, item->text), mw/3); + dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">")); drawtext(dc, item->text, (item == sel) ? selcol : normcol); } dc->w = textw(dc, ">"); @@ -132,7 +179,7 @@ drawmenu(void) { if(next) drawtext(dc, ">", normcol); } - commitdraw(dc, win, mw, mh); + mapdc(dc, win, mw, mh); } char * @@ -159,7 +206,9 @@ grabkeyboard(void) { void insert(const char *s, ssize_t n) { - memmove(text + cursor + n, text + cursor, sizeof text - cursor - 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; @@ -169,7 +218,6 @@ insert(const char *s, ssize_t n) { void keypress(XKeyEvent *ev) { char buf[32]; - int n; size_t len; KeySym ksym; @@ -217,38 +265,31 @@ keypress(XKeyEvent *ev) { ksym = XK_Up; break; case XK_u: /* delete left */ - insert(NULL, -cursor); + insert(NULL, 0 - cursor); break; case XK_w: /* delete word */ - if(cursor == 0) - return; - n = 0; - while(cursor - n++ > 0 && text[cursor - n] == ' '); - while(cursor - n++ > 0 && text[cursor - n] != ' '); - insert(NULL, 1-n); + 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, None, win, CurrentTime); + XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime); return; } } switch(ksym) { default: - if(isprint(*buf)) - insert(buf, MIN(strlen(buf), sizeof text - cursor)); - break; - case XK_BackSpace: - if(cursor == 0) - return; - for(n = 1; cursor - n > 0 && !UTF8_CODEPOINT(text[cursor - n]); n++); - insert(NULL, -n); + if(!iscntrl(*buf)) + insert(buf, strlen(buf)); break; case XK_Delete: if(cursor == len) return; - for(n = 1; cursor + n < len && !UTF8_CODEPOINT(text[cursor + n]); n++); - cursor += n; - insert(NULL, -n); + cursor = nextrune(+1); + case XK_BackSpace: + if(cursor > 0) + insert(NULL, nextrune(-1) - cursor); break; case XK_End: if(cursor < len) { @@ -274,15 +315,13 @@ keypress(XKeyEvent *ev) { break; case XK_Left: if(cursor > 0 && (!sel || !sel->left || lines > 0)) { - while(cursor-- > 0 && !UTF8_CODEPOINT(text[cursor])); + cursor = nextrune(-1); break; } else if(lines > 0) return; case XK_Up: - if(!sel || !sel->left) - return; - if((sel = sel->left)->right == curr) { + if(sel && sel->left && (sel = sel->left)->right == curr) { curr = prev; calcoffsets(); } @@ -306,15 +345,13 @@ keypress(XKeyEvent *ev) { exit(EXIT_SUCCESS); case XK_Right: if(cursor < len) { - while(cursor++ < len && !UTF8_CODEPOINT(text[cursor])); + cursor = nextrune(+1); break; } else if(lines > 0) return; case XK_Down: - if(!sel || !sel->right) - return; - if((sel = sel->right) == next) { + if(sel && sel->right && (sel = sel->right) == next) { curr = next; calcoffsets(); } @@ -370,6 +407,15 @@ match(void) { 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; @@ -377,7 +423,7 @@ paste(void) { unsigned long dl; Atom da; - XGetWindowProperty(dc->dpy, win, utf8, 0, sizeof text - cursor, True, + 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); @@ -396,8 +442,8 @@ readstdin(void) { eprintf("cannot malloc %u bytes\n", sizeof *item); if(!(item->text = strdup(buf))) eprintf("cannot strdup %u bytes\n", strlen(buf)+1); - inputw = MAX(inputw, textw(dc, item->text)); item->next = item->left = item->right = NULL; + inputw = MAX(inputw, textw(dc, item->text)); } } @@ -445,6 +491,7 @@ setup(void) { /* menu geometry */ bh = dc->font.height + 2; + lines = MAX(lines, 0); mh = (lines + 1) * bh; #ifdef XINERAMA if((info = XineramaQueryScreens(dc->dpy, &n))) { @@ -454,7 +501,8 @@ setup(void) { XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du); for(i = 0; i < n; i++) - if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)) + 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 = info[i].y_org + (topbar ? 0 : info[i].height - mh); @@ -478,9 +526,9 @@ setup(void) { CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); grabkeyboard(); - setcanvas(dc, mw, mh); + resizedc(dc, mw, mh); inputw = MIN(inputw, mw/3); - promptw = prompt ? MIN(textw(dc, prompt), mw/5) : 0; + promptw = prompt ? textw(dc, prompt) : 0; XMapRaised(dc->dpy, win); text[0] = '\0'; match(); @@ -488,51 +536,7 @@ setup(void) { 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); + 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); 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], "-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 = initdraw(); - initfont(dc, font); - readstdin(); - setup(); - run(); - - return EXIT_FAILURE; /* should not reach */ -}