X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=849746ca9dbbd84e0fa687c24e3d6b7c9b806ee8;hb=596033b7818f5ff126ec6c62c375afc4c1e32dda;hp=b28a5486d42310ffd66c93f8b5d57c3eb1d8c424;hpb=72a8eb412f48edb6c3b113d2582722d1bc7c68ce;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index b28a548..849746c 100644 --- a/dmenu.c +++ b/dmenu.c @@ -9,6 +9,9 @@ #include #include #include +#ifdef XINERAMA +#include +#endif /* macros */ #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) @@ -17,10 +20,12 @@ enum { ColFG, ColBG, ColLast }; /* typedefs */ +typedef unsigned int uint; +typedef unsigned long ulong; typedef struct { int x, y, w, h; - unsigned long norm[ColLast]; - unsigned long sel[ColLast]; + ulong norm[ColLast]; + ulong sel[ColLast]; Drawable drawable; GC gc; struct { @@ -34,32 +39,31 @@ typedef struct { typedef struct Item Item; struct Item { + char *text; Item *next; /* traverses all items */ Item *left, *right; /* traverses items matching current search pattern */ - char *text; - Bool matched; }; /* forward declarations */ -Item *appenditem(Item *i, Item *last); +void appenditem(Item *i, Item **list, Item **last); void calcoffsets(void); +char *cistrstr(const char *s, const char *sub); void cleanup(void); void drawmenu(void); -void drawtext(const char *text, unsigned long col[ColLast]); -void *emalloc(unsigned int size); +void drawtext(const char *text, ulong col[ColLast]); +void *emalloc(uint size); void eprint(const char *errstr, ...); char *estrdup(const char *str); -unsigned long getcolor(const char *colstr); +ulong getcolor(const char *colstr); Bool grabkeyboard(void); void initfont(const char *fontstr); void kpress(XKeyEvent * e); void match(char *pattern); void readstdin(void); void run(void); -void setup(Bool bottom); -int strcaseido(const char *text, const char *pattern); -unsigned int textnw(const char *text, unsigned int len); -unsigned int textw(const char *text); +void setup(Bool topbar); +uint textnw(const char *text, uint len); +uint textw(const char *text); #include "config.h" @@ -74,12 +78,10 @@ char *selfg = SELFGCOLOR; char text[4096]; int screen; int ret = 0; -unsigned int cmdw = 0; -unsigned int mw, mh; -unsigned int promptw = 0; -unsigned int nitem = 0; -unsigned int numlockmask = 0; -Bool idomatch = False; +uint cmdw = 0; +uint mw, mh; +uint promptw = 0; +uint numlockmask = 0; Bool running = True; Display *dpy; DC dc = {0}; @@ -90,24 +92,23 @@ Item *next = NULL; Item *prev = NULL; Item *curr = NULL; Window root, win; +int (*fstrncmp)(const char *, const char *, size_t n) = strncmp; +char *(*fstrstr)(const char *, const char *) = strstr; -Item * -appenditem(Item *i, Item *last) { - if(!last) - item = i; +void +appenditem(Item *i, Item **list, Item **last) { + if(!(*last)) + *list = i; else - last->right = i; - i->matched = True; - i->left = last; + (*last)->right = i; + i->left = *last; i->right = NULL; - last = i; - nitem++; - return last; + *last = i; } void calcoffsets(void) { - unsigned int tw, w; + uint tw, w; if(!curr) return; @@ -131,6 +132,29 @@ calcoffsets(void) { } } +char * +cistrstr(const char *s, const char *sub) { + int c, csub; + uint 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 cleanup(void) { Item *itm; @@ -193,10 +217,10 @@ drawmenu(void) { } void -drawtext(const char *text, unsigned long col[ColLast]) { +drawtext(const char *text, ulong col[ColLast]) { int x, y, w, h; static char buf[256]; - unsigned int len, olen; + uint len, olen; XRectangle r = { dc.x, dc.y, dc.w, dc.h }; XSetForeground(dpy, dc.gc, col[ColBG]); @@ -233,7 +257,7 @@ drawtext(const char *text, unsigned long col[ColLast]) { } void * -emalloc(unsigned int size) { +emalloc(uint size) { void *res = malloc(size); if(!res) @@ -260,7 +284,7 @@ estrdup(const char *str) { return res; } -unsigned long +ulong getcolor(const char *colstr) { Colormap cmap = DefaultColormap(dpy, screen); XColor color; @@ -272,11 +296,11 @@ getcolor(const char *colstr) { Bool grabkeyboard(void) { - unsigned int len; + uint len; for(len = 1000; len; len--) { if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime) - == GrabSuccess) + == GrabSuccess) break; usleep(1000); } @@ -328,22 +352,20 @@ void kpress(XKeyEvent * e) { char buf[32]; int i, num; - unsigned int len; + uint 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) { + if(IsKeypadKey(ksym)) + if(ksym == XK_KP_Enter) ksym = XK_Return; - } else if(ksym >= XK_KP_0 && ksym <= XK_KP_9) { + 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)) + || IsMiscFunctionKey(ksym) || IsPFKey(ksym) + || IsPrivateKeypadKey(ksym)) return; /* first check if a control mask is omitted */ if(e->state & ControlMask) { @@ -497,26 +519,41 @@ kpress(XKeyEvent * e) { void match(char *pattern) { - unsigned int plen; - Item *i, *j; + uint plen; + Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend; if(!pattern) return; plen = strlen(pattern); - item = j = NULL; - nitem = 0; - for(i = allitems; i; i=i->next) - i->matched = False; - for(i = allitems; i; i = i->next) - if(!i->matched && !strncasecmp(pattern, i->text, plen)) - j = appenditem(i, j); + item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL; for(i = allitems; i; i = i->next) - if(!i->matched && strcasestr(i->text, pattern)) - j = appenditem(i, j); - if(idomatch) - for(i = allitems; i; i = i->next) - if(!i->matched && strcaseido(i->text, pattern)) - j = appenditem(i, j); + 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; + itemend = exactend; + } + if(lprefix) { + if(itemend) { + itemend->right = lprefix; + lprefix->left = itemend; + } + else + item = lprefix; + itemend = prefixend; + } + if(lsubstr) { + if(itemend) { + itemend->right = lsubstr; + lsubstr->left = itemend; + } + else + item = lsubstr; + } curr = prev = next = sel = item; calcoffsets(); } @@ -524,7 +561,7 @@ match(char *pattern) { void readstdin(void) { char *p, buf[1024]; - unsigned int len = 0, max = 0; + uint len = 0, max = 0; Item *i, *new; i = 0; @@ -568,10 +605,13 @@ run(void) { } void -setup(Bool bottom) { - unsigned int i, j; +setup(Bool topbar) { + int i, j, x, y; XModifierKeymap *modmap; XSetWindowAttributes wa; +#if XINERAMA + XineramaScreenInfo *info = NULL; +#endif /* init modifier map */ modmap = XGetModifierMapping(dpy); @@ -594,10 +634,26 @@ setup(Bool bottom) { wa.override_redirect = 1; wa.background_pixmap = ParentRelative; wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; - mw = DisplayWidth(dpy, screen); + + /* menu window geometry */ mh = dc.font.height + 2; - win = XCreateWindow(dpy, root, 0, - bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0, +#if XINERAMA + if(XineramaIsActive(dpy)) { + info = XineramaQueryScreens(dpy, &i); + x = info[0].x_org; + y = topbar ? info[0].y_org : info[0].y_org + info[0].height - mh; + mw = info[0].width; + XFree(info); + } + else +#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); @@ -621,16 +677,8 @@ setup(Bool bottom) { XMapRaised(dpy, win); } -int -strcaseido(const char *text, const char *pattern) { - for(; *text && *pattern; text++) - if(tolower((int)*text) == tolower((int)*pattern)) - pattern++; - return !*pattern; -} - -unsigned int -textnw(const char *text, unsigned int len) { +uint +textnw(const char *text, uint len) { XRectangle r; if(dc.font.set) { @@ -640,23 +688,24 @@ textnw(const char *text, unsigned int len) { return XTextWidth(dc.font.xfont, text, len); } -unsigned int +uint textw(const char *text) { return textnw(text, strlen(text)) + dc.font.height; } int main(int argc, char *argv[]) { - Bool bottom = False; - unsigned int i; + uint i; + Bool topbar = True; /* command line args */ for(i = 1; i < argc; i++) - if(!strcmp(argv[i], "-b")) { - bottom = True; + if(!strcmp(argv[i], "-i")) { + fstrncmp = strncasecmp; + fstrstr = cistrstr; } - else if(!strcmp(argv[i], "-i")) - idomatch = True; + else if(!strcmp(argv[i], "-b")) + topbar = False; else if(!strcmp(argv[i], "-fn")) { if(++i < argc) font = argv[i]; } @@ -676,13 +725,12 @@ main(int argc, char *argv[]) { if(++i < argc) selfg = argv[i]; } else if(!strcmp(argv[i], "-v")) - eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk, Michał Janeczek\n"); + eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n"); else - eprint("usage: dmenu [-b] [-i] [-fn ] [-nb ] [-nf ]\n" - " [-p ] [-sb ] [-sf ] [-v]\n"); + eprint("usage: dmenu [-i] [-b] [-fn ] [-nb ] [-nf ]\n" + " [-p ] [-sb ] [-sf ] [-v]\n"); setlocale(LC_CTYPE, ""); - dpy = XOpenDisplay(0); - if(!dpy) + if(!(dpy = XOpenDisplay(0))) eprint("dmenu: cannot open display\n"); screen = DefaultScreen(dpy); root = RootWindow(dpy, screen); @@ -696,7 +744,7 @@ main(int argc, char *argv[]) { readstdin(); } - setup(bottom); + setup(topbar); drawmenu(); XSync(dpy, False); run();