X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=dmenu.c;h=688fabf26a4aa39d5c912f7276d6e29b6911cb59;hb=745c46d8fa810bbf45ef16e79a0f84c787f1a670;hp=5cb638b6e5e42cea25b83848130ab5c5ac447c60;hpb=56f9e26b7268d653afb6db82aac9bad71abde0dd;p=dmenu.git diff --git a/dmenu.c b/dmenu.c index 5cb638b..688fabf 100644 --- a/dmenu.c +++ b/dmenu.c @@ -34,13 +34,16 @@ typedef struct { typedef struct Item Item; struct Item { + char *text; + Bool matched; Item *next; /* traverses all items */ Item *left, *right; /* traverses items matching current search pattern */ - char *text; }; /* forward declarations */ +Item *appenditem(Item *i, 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]); @@ -54,8 +57,7 @@ void kpress(XKeyEvent * e); void match(char *pattern); void readstdin(void); void run(void); -void setup(Bool bottom); -int strido(const char *text, const char *pattern); +void setup(int x, int y, int w); unsigned int textnw(const char *text, unsigned int len); unsigned int textw(const char *text); @@ -87,6 +89,21 @@ 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; + else + last->right = i; + i->left = last; + i->right = NULL; + last = i; + nitem++; + return last; +} void calcoffsets(void) { @@ -114,6 +131,29 @@ calcoffsets(void) { } } +char * +cistrstr(const char *s, const char *sub) { + int c, csub; + unsigned int 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; @@ -488,42 +528,12 @@ match(char *pattern) { plen = strlen(pattern); item = j = NULL; nitem = 0; - for(i = allitems; i; i=i->next) - if(!plen || !strncmp(pattern, i->text, plen)) { - if(!j) - item = i; - else - j->right = i; - i->left = j; - i->right = NULL; - j = i; - nitem++; - } - for(i = allitems; i; i=i->next) - if(plen && strncmp(pattern, i->text, plen) - && strstr(i->text, pattern)) { - if(!j) - item = i; - else - j->right = i; - i->left = j; - i->right = NULL; - j = i; - nitem++; - } - for(i = allitems; i; i=i->next) - if(plen && strncmp(pattern, i->text, plen) - && !strstr(i->text, pattern) - && strido(i->text,pattern)) { - if(!j) - item = i; - else - j->right = i; - i->left = j; - i->right = NULL; - j = i; - nitem++; - } + for(i = allitems; i; i = i->next) + if((i->matched = !fstrncmp(pattern, i->text, plen))) + j = appenditem(i, j); + for(i = allitems; i; i = i->next) + if(!i->matched && fstrstr(i->text, pattern)) + j = appenditem(i, j); curr = prev = next = sel = item; calcoffsets(); } @@ -575,7 +585,7 @@ run(void) { } void -setup(Bool bottom) { +setup(int x, int y, int w) { unsigned int i, j; XModifierKeymap *modmap; XSetWindowAttributes wa; @@ -601,10 +611,15 @@ setup(Bool bottom) { wa.override_redirect = 1; wa.background_pixmap = ParentRelative; wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask; - mw = DisplayWidth(dpy, screen); + mw = w ? w : DisplayWidth(dpy, screen); mh = dc.font.height + 2; - win = XCreateWindow(dpy, root, 0, - bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0, + if(y < 0) { + if(y == (int)(unsigned int)-1) + y = DisplayHeight(dpy, screen) - mh; + else + y = (-1 * y) - mh; + } + win = XCreateWindow(dpy, root, x, y, mw, mh, 0, DefaultDepth(dpy, screen), CopyFromParent, DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa); @@ -628,14 +643,6 @@ setup(Bool bottom) { XMapRaised(dpy, win); } -int -strido(const char *text, const char *pattern) { - for(; *text && *pattern; text++) - if (*text == *pattern) - pattern++; - return !*pattern; -} - unsigned int textnw(const char *text, unsigned int len) { XRectangle r; @@ -654,13 +661,14 @@ textw(const char *text) { int main(int argc, char *argv[]) { - Bool bottom = False; + int x = 0, y = 0, w = 0; unsigned int i; /* 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], "-fn")) { if(++i < argc) font = argv[i]; @@ -680,11 +688,26 @@ main(int argc, char *argv[]) { else if(!strcmp(argv[i], "-sf")) { if(++i < argc) selfg = argv[i]; } + else if(!strcmp(argv[i], "-x")) { + if(++i < argc) x = atoi(argv[i]); + } + else if(!strcmp(argv[i], "-y")) { + if(++i < argc) { + if(!strcmp(argv[i], "-0")) + y = (int)(unsigned int)-1; + else + y = atoi(argv[i]); + } + } + else if(!strcmp(argv[i], "-w")) { + if(++i < argc) w = atoi(argv[i]); + } else if(!strcmp(argv[i], "-v")) - eprint("dmenu-"VERSION", © 2006-2007 Anselm R. Garbe, Sander van Dijk\n"); + eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n"); else - eprint("usage: dmenu [-b] [-fn ] [-nb ] [-nf ]\n" - " [-p ] [-sb ] [-sf ] [-v]\n"); + eprint("usage: dmenu [-i] [-fn ] [-nb ] [-nf ]\n" + " [-p ] [-sb ] [-sf ]\n" + " [-x ] [-y ] [-w ] [-v]\n"); setlocale(LC_CTYPE, ""); dpy = XOpenDisplay(0); if(!dpy) @@ -701,7 +724,7 @@ main(int argc, char *argv[]) { readstdin(); } - setup(bottom); + setup(x, y, w); drawmenu(); XSync(dpy, False); run();