X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=fd9baaae6bfd82b7ee25aa39ceee50f85b4228c8;hb=052ffae1924a2760baa32f41e01de82e73e0bc5e;hp=18f2a56d13928798f15b09f8912553c582b2affa;hpb=3e60c5d836c1f9f3b4415782de48476663943274;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 18f2a56..fd9baaa 100644 --- a/dmenu.c +++ b/dmenu.c @@ -1,5 +1,4 @@ /* See LICENSE file for copyright and license details. */ -#define _BSD_SOURCE #include #include #include @@ -19,6 +18,7 @@ #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 }; @@ -48,10 +48,14 @@ struct Item { /* forward declarations */ static void appenditem(Item *i, Item **list, Item **last); -static void calcoffsets(void); +static void calcoffsetsh(void); +static void calcoffsetsv(void); static char *cistrstr(const char *s, const char *sub); static void cleanup(void); +static void drawcursor(void); 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); @@ -74,12 +78,13 @@ static char text[4096]; static int cmdw = 0; static int promptw = 0; static int ret = 0; +static int cursor = 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 DC dc; static Item *allitems = NULL; /* first of all items */ static Item *item = NULL; /* first of pattern matching items */ static Item *sel = NULL; @@ -89,6 +94,9 @@ static Item *curr = NULL; static Window root, win; static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp; static char *(*fstrstr)(const char *, const char *) = strstr; +static Bool vlist = False; +static unsigned int lines = 5; +static void (*calcoffsets)(void) = calcoffsetsh; void appenditem(Item *i, Item **list, Item **last) { @@ -102,7 +110,7 @@ appenditem(Item *i, Item **list, Item **last) { } void -calcoffsets(void) { +calcoffsetsh(void) { int tw; unsigned int w; @@ -128,6 +136,26 @@ calcoffsets(void) { } } +void +calcoffsetsv(void) { + static unsigned int w; + + 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; + } +} + char * cistrstr(const char *s, const char *sub) { int c, csub; @@ -141,7 +169,7 @@ cistrstr(const char *s, const char *sub) { do { do { if((csub = *s++) == 0) - return (NULL); + return NULL; } while(tolower(csub) != c); } @@ -172,9 +200,17 @@ cleanup(void) { } void -drawmenu(void) { - Item *i; +drawcursor(void) { + XRectangle r = { dc.x, dc.y + 2, 1, dc.font.height - 2 }; + + r.x += textnw(text, cursor) + dc.font.height / 2; + + XSetForeground(dpy, dc.gc, dc.norm[ColFG]); + XFillRectangles(dpy, dc.drawable, dc.gc, &r, 1); +} +void +drawmenu(void) { dc.x = 0; dc.y = 0; dc.w = mw; @@ -191,27 +227,51 @@ drawmenu(void) { if(cmdw && item) dc.w = cmdw; drawtext(text[0] ? text : NULL, dc.norm); + drawcursor(); 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.x = mw - spaceitem; - dc.w = spaceitem; - drawtext(next ? ">" : NULL, dc.norm); + if(vlist) + drawmenuv(); + else + drawmenuh(); } XCopyArea(dpy, dc.drawable, win, dc.gc, 0, 0, mw, mh, 0, 0); XFlush(dpy); } +void +drawmenuh(void) { + Item *i; + + 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 = MIN(textw(i->text), 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); +} + +void +drawmenuv(void) { + Item *i; + + 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); +} + void drawtext(const char *text, unsigned long col[ColLast]) { char buf[256]; @@ -223,8 +283,8 @@ drawtext(const char *text, unsigned long col[ColLast]) { if(!text) return; olen = strlen(text); - h = dc.font.ascent + dc.font.descent; - y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent; + 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--); @@ -300,9 +360,6 @@ initfont(const char *fontstr) { } } 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); @@ -314,14 +371,14 @@ initfont(const char *fontstr) { void kpress(XKeyEvent * e) { - char buf[32]; + char buf[sizeof text]; int i, num; unsigned int len; KeySym ksym; len = strlen(text); buf[0] = 0; - num = XLookupString(e, buf, sizeof buf, &ksym, 0); + num = XLookupString(e, buf, sizeof buf, &ksym, NULL); if(IsKeypadKey(ksym)) { if(ksym == XK_KP_Enter) ksym = XK_Return; @@ -337,7 +394,8 @@ kpress(XKeyEvent * e) { switch (ksym) { default: /* ignore other control sequences */ return; - case XK_bracketleft: + case XK_c: + case XK_C: ksym = XK_Escape; break; case XK_h: @@ -356,20 +414,18 @@ kpress(XKeyEvent * e) { case XK_U: text[0] = 0; match(text); - drawmenu(); - return; + 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; + if(cursor > 0) { + i = cursor; + while(i-- > 0 && text[i] == ' '); + while(i-- > 0 && text[i] != ' '); + memmove(text + i + 1, text + cursor, sizeof text - cursor); + cursor = i + 1; match(text); - drawmenu(); } - return; + break; } } if(CLEANMASK(e->state) & Mod1Mask) { @@ -393,28 +449,49 @@ kpress(XKeyEvent * e) { case XK_G: ksym = XK_End; break; + case XK_p: + { + FILE *fp; + char *c; + if(!(fp = (FILE*)popen("sselp", "r"))) + eprint("dmenu: Could not popen sselp\n"); + c = fgets(buf, sizeof buf, fp); + pclose(fp); + if(c == NULL) + return; + } + num = strlen(buf); + if(num && buf[num-1] == '\n') + buf[--num] = '\0'; + break; } } switch(ksym) { default: + num = MIN(num, sizeof text - cursor); if(num && !iscntrl((int) buf[0])) { - buf[num] = 0; - if(len > 0) - strncat(text, buf, sizeof text); - else - strncpy(text, buf, sizeof text); + memmove(text + cursor + num, text + cursor, sizeof text - cursor - num); + memcpy(text + cursor, buf, num); + cursor+=num; match(text); } break; case XK_BackSpace: - if(len) { - text[--len] = 0; + if(cursor > 0) { + memmove(text + cursor - 1, text + cursor, sizeof text - cursor + 1); + cursor--; match(text); } break; + case XK_Delete: + memmove(text + cursor, text + cursor + 1, sizeof text - cursor); + match(text); + break; case XK_End: - if(!item) - return; + if(cursor < len) { + cursor = len; + break; + } while(next) { sel = curr = next; calcoffsets(); @@ -427,19 +504,26 @@ kpress(XKeyEvent * e) { running = False; break; case XK_Home: - if(!item) - return; + if(sel == item) { + cursor = 0; + break; + } sel = curr = item; calcoffsets(); break; case XK_Left: - if(!(sel && sel->left)) - return; - sel=sel->left; - if(sel->right == curr) { - curr = prev; - calcoffsets(); + case XK_Up: + if(sel && sel->left){ + sel=sel->left; + if(sel->right == curr) { + curr = prev; + calcoffsets(); + } } + else if(cursor > 0) + cursor--; + else + return; break; case XK_Next: if(!next) @@ -454,28 +538,32 @@ kpress(XKeyEvent * e) { calcoffsets(); break; case XK_Return: - if((e->state & ShiftMask) && *text) + if((e->state & ShiftMask) || !sel) fprintf(stdout, "%s", text); - else if(sel) + else fprintf(stdout, "%s", sel->text); - else if(*text) - fprintf(stdout, "%s", text); fflush(stdout); running = False; break; case XK_Right: - if(!(sel && sel->right)) - return; - sel=sel->right; - if(sel == next) { - curr = next; - calcoffsets(); + case XK_Down: + if(cursor < len) + cursor++; + else if(sel && sel->right) { + sel=sel->right; + if(sel == next) { + curr = next; + calcoffsets(); + } } + else + return; break; case XK_Tab: if(!sel) return; strncpy(text, sel->text, sizeof text); + cursor = strlen(text); match(text); break; } @@ -529,18 +617,18 @@ readstdin(void) { 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)); + eprint("fatal: could not strdup() %u bytes\n", len); if(max < len) { maxname = p; max = len; } - if((new = (Item *)malloc(sizeof(Item))) == NULL) + if(!(new = (Item *)malloc(sizeof(Item)))) eprint("fatal: could not malloc() %u bytes\n", sizeof(Item)); new->next = new->left = new->right = NULL; new->text = p; @@ -599,12 +687,13 @@ setup(Bool topbar) { initfont(font); /* menu window */ - wa.override_redirect = 1; + wa.override_redirect = True; wa.background_pixmap = ParentRelative; wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; /* menu window geometry */ mh = dc.font.height + 2; + mh = vlist ? mh * (lines+1) : mh; #if XINERAMA if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { i = 0; @@ -637,18 +726,14 @@ setup(Bool topbar) { /* pixmap */ dc.drawable = XCreatePixmap(dpy, root, mw, mh, DefaultDepth(dpy, screen)); - dc.gc = XCreateGC(dpy, root, 0, 0); + 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; + cmdw = MIN(textw(maxname), mw / 3); if(prompt) - promptw = textw(prompt); - if(promptw > mw / 5) - promptw = mw / 5; + promptw = MIN(textw(prompt), mw / 5); text[0] = 0; match(text); XMapRaised(dpy, win); @@ -683,6 +768,14 @@ main(int argc, char *argv[]) { } else if(!strcmp(argv[i], "-b")) topbar = False; + else if(!strcmp(argv[i], "-e")) { + if(++i < argc) root = atoi(argv[i]); + } + else if(!strcmp(argv[i], "-l")) { + vlist = True; + calcoffsets = calcoffsetsv; + if(++i < argc) lines = atoi(argv[i]); + } else if(!strcmp(argv[i], "-fn")) { if(++i < argc) font = argv[i]; } @@ -702,16 +795,17 @@ main(int argc, char *argv[]) { if(++i < argc) selfgcolor = argv[i]; } else if(!strcmp(argv[i], "-v")) - eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n"); + eprint("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n"); else - eprint("usage: dmenu [-i] [-b] [-fn ] [-nb ] [-nf ]\n" + eprint("usage: dmenu [-i] [-b] [-l ] [-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))) + if(!(dpy = XOpenDisplay(NULL))) eprint("dmenu: cannot open display\n"); screen = DefaultScreen(dpy); - root = RootWindow(dpy, screen); + if(!root) + root = RootWindow(dpy, screen); if(isatty(STDIN_FILENO)) { readstdin();