fixed match() to prefer prefix-matches to strstr-matches in the match list, extended...

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 3bb9351..688fabf 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -34,15 +34,16 @@ typedef struct {
 
 typedef struct Item Item;
 struct Item {
-       Item *next;             /* traverses all items */
-       Item *left, *right;     /* traverses items matching current search pattern */
        char *text;
        Bool matched;
+       Item *next;             /* traverses all items */
+       Item *left, *right;     /* traverses items matching current search pattern */
 };
 
 /* 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]);
@@ -56,8 +57,7 @@ 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);
+void setup(int x, int y, int w);
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 
@@ -79,7 +79,6 @@ unsigned int mw, mh;
 unsigned int promptw = 0;
 unsigned int nitem = 0;
 unsigned int numlockmask = 0;
-Bool idomatch = False;
 Bool running = True;
 Display *dpy;
 DC dc = {0};
@@ -90,6 +89,8 @@ 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) {
@@ -97,7 +98,6 @@ appenditem(Item *i, Item *last) {
                item = i;
        else
                last->right = i;
-       i->matched = True;
        i->left = last;
        i->right = NULL;
        last = i;
@@ -131,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;
@@ -505,22 +528,12 @@ match(char *pattern) {
        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);
-
-       for (i = allitems; i; i = i->next)
-               if(!i->matched && strcasestr(i->text, pattern))
+               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);
-
-       if(idomatch)
-               for (i = allitems; i; i = i->next)
-                       if(!i->matched && strcaseido(i->text, pattern))
-                               j = appenditem(i, j);
-
        curr = prev = next = sel = item;
        calcoffsets();
 }
@@ -572,7 +585,7 @@ run(void) {
 }
 
 void
-setup(Bool bottom) {
+setup(int x, int y, int w) {
        unsigned int i, j;
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
@@ -598,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);
@@ -625,14 +643,6 @@ setup(Bool bottom) {
        XMapRaised(dpy, win);
 }
 
-int
-strcaseido(const char *text, const char *pattern) {
-       for(; *text && *pattern; text++)
-               if (tolower(*text) == tolower(*pattern))
-                       pattern++;
-       return !*pattern;
-}                                  
-
 unsigned int
 textnw(const char *text, unsigned int len) {
        XRectangle r;
@@ -651,16 +661,15 @@ 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], "-i"))
-                       idomatch = True;
                else if(!strcmp(argv[i], "-fn")) {
                        if(++i < argc) font = argv[i];
                }
@@ -679,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, Michał Janeczek\n");
+                       eprint("dmenu-"VERSION", © 2006-2008 dmenu engineers, see LICENSE for details\n");
                else
-                       eprint("usage: dmenu [-b] [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
-                       "             [-p <prompt>] [-sb <color>] [-sf <color>] [-v]\n");
+                       eprint("usage: dmenu [-i] [-fn <font>] [-nb <color>] [-nf <color>]\n"
+                              "             [-p <prompt>] [-sb <color>] [-sf <color>]\n"
+                              "             [-x <x>] [-y <y>] [-w <w>] [-v]\n");
        setlocale(LC_CTYPE, "");
        dpy = XOpenDisplay(0);
        if(!dpy)
@@ -700,7 +724,7 @@ main(int argc, char *argv[]) {
                readstdin();
        }
 
-       setup(bottom);
+       setup(x, y, w);
        drawmenu();
        XSync(dpy, False);
        run();