X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=15ce8c75e463e74be1fae896905cc314f8b06289;hb=9a33a72c6afd9042c8395f4318bf5d21e235694d;hp=97014cc4e3d3efebace044eb033435d687233a48;hpb=3472085f59123384fa99252c195fee31160a7764;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 97014cc..15ce8c7 100644 --- a/dmenu.c +++ b/dmenu.c @@ -19,6 +19,7 @@ #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 IS_UTF8_1ST_CHAR(c) ((((c) & 0xc0) == 0xc0) || !((c) & 0x80)) /* enums */ enum { ColFG, ColBG, ColLast }; @@ -42,8 +43,8 @@ typedef struct { 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 items matching current search pattern */ }; /* forward declarations */ @@ -78,24 +79,23 @@ 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 cursor = 0; static unsigned int numlockmask = 0; static Bool running = True; static Display *dpy; static DC dc; -static Item *allitems = NULL; /* first of all items */ -static Item *item = NULL; /* first of pattern matching items */ +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 Window root, win; -static int (*fstrncmp)(const char *, const char *, size_t n) = strncmp; +static Window parent, win; +static int (*fstrncmp)(const char *, const char *, size_t) = strncmp; static char *(*fstrstr)(const char *, const char *) = strstr; -static Bool vlist = False; -static unsigned int lines = 5; +static unsigned int lines = 0; static void (*calcoffsets)(void) = calcoffsetsh; void @@ -111,45 +111,30 @@ appenditem(Item *i, Item **list, Item **last) { void calcoffsetsh(void) { - int tw; unsigned int w; if(!curr) return; w = promptw + cmdw + 2 * spaceitem; - for(next = curr; next; next=next->right) { - tw = MIN(textw(next->text), mw / 3); - w += tw; - if(w > mw) - break; - } + for(next = curr; next && w < mw; next=next->right) + w += MIN(textw(next->text), mw / 3); w = promptw + cmdw + 2 * spaceitem; - for(prev = curr; prev && prev->left; prev=prev->left) { - tw = MIN(textw(prev->left->text), mw / 3); - w += tw; - if(w > mw) - break; - } + for(prev = curr; prev && prev->left && w < mw; prev=prev->left) + w += MIN(textw(prev->left->text), mw / 3); } void calcoffsetsv(void) { - static unsigned int h; + unsigned int h; if(!curr) return; - h = (dc.font.height + 2) * (lines + 1); - for(next = curr; next; next=next->right) { + h = (dc.font.height + 2) * lines; + for(next = curr; next && h > 0; next = next->right) h -= dc.font.height + 2; - if(h <= 0) - break; - } - h = (dc.font.height + 2) * (lines + 1); - for(prev = curr; prev && prev->left; prev=prev->left) { + h = (dc.font.height + 2) * lines; + for(prev = curr; prev && prev->left && h > 0; prev = prev->left) h -= dc.font.height + 2; - if(h <= 0) - break; - } } char * @@ -159,12 +144,11 @@ cistrstr(const char *s, const char *sub) { if(!sub) return (char *)s; - if((c = *sub++) != 0) { - c = tolower(c); + if((c = tolower(*sub++)) != '\0') { len = strlen(sub); do { do { - if((csub = *s++) == 0) + if((csub = *s++) == '\0') return NULL; } while(tolower(csub) != c); @@ -177,14 +161,6 @@ cistrstr(const char *s, const char *sub) { 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); else @@ -213,20 +189,19 @@ drawmenu(void) { dc.h = mh; drawtext(NULL, dc.norm); /* print prompt? */ - if(promptw) { + if(prompt) { dc.w = promptw; drawtext(prompt, dc.sel); + dc.x += dc.w; } - dc.x += promptw; - dc.w = mw - promptw; + dc.w = mw - dc.x; /* print command */ - if(cmdw && item) + if(cmdw && item && lines == 0) dc.w = cmdw; - drawtext(text[0] ? text : NULL, dc.norm); + drawtext(*text ? text : NULL, dc.norm); drawcursor(); - dc.x += cmdw; if(curr) { - if(vlist) + if(lines > 0) drawmenuv(); else drawmenuh(); @@ -239,17 +214,17 @@ void drawmenuh(void) { Item *i; + dc.x += cmdw; dc.w = spaceitem; - drawtext((curr && curr->left) ? "<" : NULL, dc.norm); + drawtext(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; + dc.x = mw - dc.w; drawtext(next ? ">" : NULL, dc.norm); } @@ -257,14 +232,14 @@ void drawmenuv(void) { Item *i; - dc.x = 0; - dc.w = mw; - dc.y += dc.font.height + 2; - /* determine maximum items */ + dc.w = mw - dc.x; + dc.h = dc.font.height + 2; + dc.y = dc.h; for(i = curr; i != next; i=i->right) { drawtext(i->text, (sel == i) ? dc.sel : dc.norm); - dc.y += dc.font.height + 2; + dc.y += dc.h; } + dc.h = mh - dc.y; drawtext(NULL, dc.norm); } @@ -312,7 +287,7 @@ getcolor(const char *colstr) { XColor color; if(!XAllocNamedColor(dpy, cmap, colstr, &color, &color)) - eprint("error, cannot allocate color '%s'\n", colstr); + eprint("dmenu: cannot allocate color '%s'\n", colstr); return color.pixel; } @@ -321,7 +296,7 @@ grabkeyboard(void) { unsigned int len; for(len = 1000; len; len--) { - if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) + if(XGrabKeyboard(dpy, parent, True, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) break; usleep(1000); @@ -331,23 +306,20 @@ grabkeyboard(void) { void initfont(const char *fontstr) { - char *def, **missing; + char *def, **missing = NULL; int i, n; if(!fontstr || fontstr[0] == '\0') - eprint("error, cannot load font: '%s'\n", fontstr); - missing = NULL; + eprint("dmenu: cannot load font: '%s'\n", fontstr); 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++) { + for(i = 0; i < n; i++) { dc.font.ascent = MAX(dc.font.ascent, (*xfonts)->ascent); dc.font.descent = MAX(dc.font.descent, (*xfonts)->descent); xfonts++; @@ -356,7 +328,7 @@ initfont(const char *fontstr) { else { if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr)) && !(dc.font.xfont = XLoadQueryFont(dpy, "fixed"))) - eprint("error, cannot load font: '%s'\n", fontstr); + eprint("dmenu: cannot load font: '%s'\n", fontstr); dc.font.ascent = dc.font.xfont->ascent; dc.font.descent = dc.font.xfont->descent; } @@ -366,59 +338,64 @@ initfont(const char *fontstr) { void kpress(XKeyEvent * e) { char buf[sizeof text]; - int i, num; - unsigned int len; + int num; + unsigned int i, len; KeySym ksym; len = strlen(text); - buf[0] = 0; num = XLookupString(e, buf, sizeof buf, &ksym, NULL); - 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)) + 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; + else 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 */ + switch(tolower(ksym)) { + default: return; case XK_a: - case XK_A: ksym = XK_Home; break; + case XK_b: + ksym = XK_Left; + break; case XK_c: - case XK_C: ksym = XK_Escape; break; case XK_e: - 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_k: + text[cursor] = '\0'; + break; + case XK_n: + ksym = XK_Down; + break; + case XK_p: + ksym = XK_Up; + break; case XK_u: - case XK_U: - text[0] = 0; + memmove(text, text + cursor, sizeof text - cursor + 1); + cursor = 0; match(text); break; case XK_w: - case XK_W: if(cursor > 0) { i = cursor; while(i-- > 0 && text[i] == ' '); @@ -428,35 +405,12 @@ kpress(XKeyEvent * e) { match(text); } break; - } - } - if(CLEANMASK(e->state) & Mod1Mask) { - switch(ksym) { - default: return; - case XK_h: - ksym = XK_Left; - break; - case XK_l: - ksym = XK_Right; - break; - case XK_j: - ksym = XK_Next; - break; - case XK_k: - ksym = XK_Prior; - break; - case XK_g: - ksym = XK_Home; - break; - case XK_G: - ksym = XK_End; - break; - case XK_p: + case XK_y: { FILE *fp; char *s; - if(!(fp = (FILE*)popen("sselp", "r"))) - eprint("dmenu: Could not popen sselp\n"); + if(!(fp = popen("sselp", "r"))) + eprint("dmenu: cannot popen sselp\n"); s = fgets(buf, sizeof buf, fp); pclose(fp); if(s == NULL) @@ -474,19 +428,23 @@ kpress(XKeyEvent * e) { if(num && !iscntrl((int) buf[0])) { memmove(text + cursor + num, text + cursor, sizeof text - cursor - num); memcpy(text + cursor, buf, num); - cursor+=num; + cursor += num; match(text); } break; case XK_BackSpace: - if(cursor > 0) { - memmove(text + cursor - 1, text + cursor, sizeof text - cursor + 1); - cursor--; - match(text); - } + if(cursor == 0) + return; + for(i = 1; cursor - i > 0 && !IS_UTF8_1ST_CHAR(text[cursor - i]); i++); + memmove(text + cursor - i, text + cursor, sizeof text - cursor + i); + cursor -= i; + match(text); break; case XK_Delete: - memmove(text + cursor, text + cursor + 1, sizeof text - cursor); + if(cursor == len) + return; + for(i = 1; cursor + i < len && !IS_UTF8_1ST_CHAR(text[cursor + i]); i++); + memmove(text + cursor, text + cursor + i, sizeof text - cursor); match(text); break; case XK_End: @@ -504,7 +462,7 @@ kpress(XKeyEvent * e) { case XK_Escape: ret = 1; running = False; - break; + return; case XK_Home: if(sel == item) { cursor = 0; @@ -514,18 +472,20 @@ kpress(XKeyEvent * e) { calcoffsets(); break; case XK_Left: - case XK_Up: - if(sel && sel->left){ - sel=sel->left; - if(sel->right == curr) { - curr = prev; - calcoffsets(); - } + if(cursor > 0 && (!sel || !sel->left)) { + while(cursor-- > 0 && !IS_UTF8_1ST_CHAR(text[cursor])); + break; } - else if(cursor > 0) - cursor--; - else + if(lines > 0) return; + case XK_Up: + if(!sel || !sel->left) + return; + sel = sel->left; + if(sel->right == curr) { + curr = prev; + calcoffsets(); + } break; case XK_Next: if(!next) @@ -546,20 +506,22 @@ kpress(XKeyEvent * e) { fprintf(stdout, "%s", sel->text); fflush(stdout); running = False; - break; + return; case XK_Right: - case XK_Down: - if(cursor < len) - cursor++; - else if(sel && sel->right) { - sel=sel->right; - if(sel == next) { - curr = next; - calcoffsets(); - } + if(cursor < len) { + while(cursor++ < len && !IS_UTF8_1ST_CHAR(text[cursor])); + break; } - else + if(lines > 0) return; + case XK_Down: + if(!sel || !sel->right) + return; + sel = sel->right; + if(sel == next) { + curr = next; + calcoffsets(); + } break; case XK_Tab: if(!sel) @@ -625,13 +587,11 @@ readstdin(void) { if(buf[len-1] == '\n') buf[--len] = '\0'; if(!(p = strdup(buf))) - eprint("fatal: could not strdup() %u bytes\n", len); - if(max < len) { + eprint("dmenu: cannot strdup %u bytes\n", len); + if((max = MAX(max, len)) == len) maxname = p; - max = len; - } - if(!(new = (Item *)malloc(sizeof(Item)))) - eprint("fatal: could not malloc() %u bytes\n", sizeof(Item)); + if(!(new = malloc(sizeof *new))) + eprint("dmenu: cannot malloc %u bytes\n", sizeof *new); new->next = new->left = new->right = NULL; new->text = p; if(!i) @@ -649,8 +609,6 @@ run(void) { /* main event loop */ while(running && !XNextEvent(dpy, &ev)) switch (ev.type) { - default: /* ignore all crap */ - break; case KeyPress: kpress(&ev.xkey); break; @@ -658,6 +616,10 @@ run(void) { if(ev.xexpose.count == 0) drawmenu(); break; + case VisibilityNotify: + if (ev.xvisibility.state != VisibilityUnobscured) + XRaiseWindow(dpy, win); + break; } } @@ -670,6 +632,7 @@ setup(Bool topbar) { #endif XModifierKeymap *modmap; XSetWindowAttributes wa; + XWindowAttributes pwa; /* init modifier map */ modmap = XGetModifierMapping(dpy); @@ -691,19 +654,18 @@ setup(Bool topbar) { /* menu window */ wa.override_redirect = True; wa.background_pixmap = ParentRelative; - wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; + wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask | VisibilityChangeMask; /* menu window geometry */ - mh = dc.font.height + 2; - mh = vlist ? mh * (lines+1) : mh; + mh = (dc.font.height + 2) * (lines + 1); #if XINERAMA - if(XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { + if(parent == RootWindow(dpy, screen) && XineramaIsActive(dpy) && (info = XineramaQueryScreens(dpy, &n))) { i = 0; if(n > 1) { int di; unsigned int dui; Window dummy; - if(XQueryPointer(dpy, root, &dummy, &dummy, &x, &y, &di, &di, &dui)) + if(XQueryPointer(dpy, parent, &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; @@ -716,19 +678,20 @@ setup(Bool topbar) { else #endif { + XGetWindowAttributes(dpy, parent, &pwa); x = 0; - y = topbar ? 0 : DisplayHeight(dpy, screen) - mh; - mw = DisplayWidth(dpy, screen); + y = topbar ? 0 : pwa.height - mh; + mw = pwa.width; } - win = XCreateWindow(dpy, root, x, y, mw, mh, 0, + win = XCreateWindow(dpy, parent, 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, NULL); + dc.drawable = XCreatePixmap(dpy, parent, mw, mh, DefaultDepth(dpy, screen)); + dc.gc = XCreateGC(dpy, parent, 0, NULL); XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter); if(!dc.font.set) XSetFont(dpy, dc.gc, dc.font.xfont->fid); @@ -736,7 +699,7 @@ setup(Bool topbar) { cmdw = MIN(textw(maxname), mw / 3); if(prompt) promptw = MIN(textw(prompt), mw / 5); - text[0] = 0; + text[0] = '\0'; match(text); XMapRaised(dpy, win); } @@ -771,12 +734,12 @@ 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]); + if(++i < argc) parent = atoi(argv[i]); } else if(!strcmp(argv[i], "-l")) { - vlist = True; - calcoffsets = calcoffsetsv; if(++i < argc) lines = atoi(argv[i]); + if(lines > 0) + calcoffsets = calcoffsetsv; } else if(!strcmp(argv[i], "-fn")) { if(++i < argc) font = argv[i]; @@ -802,12 +765,12 @@ main(int argc, char *argv[]) { eprint("usage: dmenu [-i] [-b] [-e ] [-l ] [-fn ] [-nb ]\n" " [-nf ] [-p ] [-sb ] [-sf ] [-v]\n"); if(!setlocale(LC_CTYPE, "") || !XSupportsLocale()) - fprintf(stderr, "warning: no locale support\n"); + fprintf(stderr, "dmenu: warning: no locale support\n"); if(!(dpy = XOpenDisplay(NULL))) eprint("dmenu: cannot open display\n"); screen = DefaultScreen(dpy); - if(!root) - root = RootWindow(dpy, screen); + if(!parent) + parent = RootWindow(dpy, screen); readstdin(); running = grabkeyboard();