bugfix of the -0 case in dmenu (thanks to Sander for his hint)

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 5cb638b..78c5a75 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -34,13 +34,15 @@ typedef struct {
 
 typedef struct Item Item;
 struct Item {
 
 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 */

-       char *text;

 };
 
 /* forward declarations */
 };
 
 /* forward declarations */

+void appenditem(Item *i, Item **list, Item **last);

 void calcoffsets(void);
 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 cleanup(void);
 void drawmenu(void);
 void drawtext(const char *text, unsigned long col[ColLast]);


@@ -54,8 +56,7 @@ void kpress(XKeyEvent * e);
 void match(char *pattern);
 void readstdin(void);
 void run(void);
 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);
 
 unsigned int textnw(const char *text, unsigned int len);
 unsigned int textw(const char *text);
 


@@ -75,7 +76,6 @@ int ret = 0;
 unsigned int cmdw = 0;
 unsigned int mw, mh;
 unsigned int promptw = 0;
 unsigned int cmdw = 0;
 unsigned int mw, mh;
 unsigned int promptw = 0;

-unsigned int nitem = 0;

 unsigned int numlockmask = 0;
 Bool running = True;
 Display *dpy;
 unsigned int numlockmask = 0;
 Bool running = True;
 Display *dpy;


@@ -87,6 +87,19 @@ Item *next = NULL;
 Item *prev = NULL;
 Item *curr = NULL;
 Window root, win;
 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;
+
+void
+appenditem(Item *i, Item **list, Item **last) {
+       if(!(*last))
+               *list = i;
+       else
+               (*last)->right = i;
+       i->left = *last;
+       i->right = NULL;
+       *last = i;
+}

 
 void
 calcoffsets(void) {
 
 void
 calcoffsets(void) {


@@ -114,6 +127,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;
 void
 cleanup(void) {
        Item *itm;


@@ -259,7 +295,7 @@ grabkeyboard(void) {
 
        for(len = 1000; len; len--) {
                if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
 
        for(len = 1000; len; len--) {
                if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)

-                       == GrabSuccess)
+               == GrabSuccess)

                        break;
                usleep(1000);
        }
                        break;
                usleep(1000);
        }


@@ -317,16 +353,14 @@ kpress(XKeyEvent * e) {
        len = strlen(text);
        buf[0] = 0;
        num = XLookupString(e, buf, sizeof buf, &ksym, 0);
        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;
                        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;
                        ksym = (ksym - XK_KP_0) + XK_0;

-               }
-       }

        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
        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) {
                return;
        /* first check if a control mask is omitted */
        if(e->state & ControlMask) {


@@ -481,49 +515,40 @@ kpress(XKeyEvent * e) {
 void
 match(char *pattern) {
        unsigned int plen;
 void
 match(char *pattern) {
        unsigned int plen;

-       Item *i, *j;
+       Item *i, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;

 
        if(!pattern)
                return;
        plen = strlen(pattern);
 
        if(!pattern)
                return;
        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++;
+       item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
+       for(i = allitems; i; i = i->next)
+               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;

                }
                }

-       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++;
+               else
+                       item = lprefix;
+               itemend = prefixend;
+       }
+       if(lsubstr) {
+               if(itemend) {
+                       itemend->right = lsubstr;
+                       lsubstr->left = itemend;

                }
                }

+               else
+                       item = lsubstr;
+       }

        curr = prev = next = sel = item;
        calcoffsets();
 }
        curr = prev = next = sel = item;
        calcoffsets();
 }


@@ -575,7 +600,7 @@ run(void) {
 }
 
 void
 }
 
 void

-setup(Bool bottom) {
+setup(int x, int y, int w) {

        unsigned int i, j;
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;
        unsigned int i, j;
        XModifierKeymap *modmap;
        XSetWindowAttributes wa;


@@ -601,10 +626,15 @@ setup(Bool bottom) {
        wa.override_redirect = 1;
        wa.background_pixmap = ParentRelative;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
        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;
        mh = dc.font.height + 2;

-       win = XCreateWindow(dpy, root, 0,
-                       bottom ? DisplayHeight(dpy, screen) - mh : 0, mw, mh, 0,
+       if(y < 0) {
+               if(y == ((~(unsigned int)0)/2)+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);
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),
                        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);


@@ -628,14 +658,6 @@ setup(Bool bottom) {
        XMapRaised(dpy, win);
 }
 
        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;
 unsigned int
 textnw(const char *text, unsigned int len) {
        XRectangle r;


@@ -654,13 +676,14 @@ textw(const char *text) {
 
 int
 main(int argc, char *argv[]) {
 
 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++)
        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];
                }
                else if(!strcmp(argv[i], "-fn")) {
                        if(++i < argc) font = argv[i];


@@ -680,11 +703,25 @@ main(int argc, char *argv[]) {
                else if(!strcmp(argv[i], "-sf")) {
                        if(++i < argc) selfg = argv[i];
                }
                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 = ((~(unsigned int)0)/2)+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"))
                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
                else

-                       eprint("usage: dmenu [-b] [-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)
        setlocale(LC_CTYPE, "");
        dpy = XOpenDisplay(0);
        if(!dpy)


@@ -701,7 +738,7 @@ main(int argc, char *argv[]) {
                readstdin();
        }
 
                readstdin();
        }
 

-       setup(bottom);
+       setup(x, y, w);

        drawmenu();
        XSync(dpy, False);
        run();
        drawmenu();
        XSync(dpy, False);
        run();