no exe should be unquoted, agreed to Peter Hartlich

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index ddde475..3d3a928 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -1,5 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>

+#include <limits.h>

 #include <locale.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <locale.h>
 #include <stdarg.h>
 #include <stdlib.h>


@@ -34,14 +35,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 */

-Item *appenditem(Item *i, Item *last);
+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]);


@@ -56,7 +58,6 @@ void match(char *pattern);
 void readstdin(void);
 void run(void);
 void setup(int x, int y, int w);
 void readstdin(void);
 void run(void);
 void setup(int x, int y, int w);

-char *cistrstr(const char *s, const char *sub);

 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);
 


@@ -76,7 +77,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;


@@ -91,17 +91,15 @@ Window root, win;
 int (*fstrncmp)(const char *, const char *, size_t n) = strncmp;
 char *(*fstrstr)(const char *, const char *) = strstr;
 
 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
        else

-               last->right = i;
-       i->left = last;
+               (*last)->right = i;
+       i->left = *last;

        i->right = NULL;
        i->right = NULL;

-       last = i;
-       nitem++;
-       return last;
+       *last = i;

 }
 
 void
 }
 
 void


@@ -130,6 +128,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;


@@ -275,7 +296,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);
        }


@@ -333,16 +354,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) {


@@ -497,18 +516,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;
+       item = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;

        for(i = allitems; i; i = i->next)
        for(i = allitems; i; i = i->next)

-               if(!fstrncmp(pattern, i->text, plen))
-                       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))
                else if(fstrstr(i->text, pattern))

-                       j = appenditem(i, j);
+                       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();
 }
        curr = prev = next = sel = item;
        calcoffsets();
 }


@@ -588,6 +629,12 @@ setup(int x, int y, int w) {
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
        mw = w ? w : DisplayWidth(dpy, screen);
        mh = dc.font.height + 2;
        wa.event_mask = ExposureMask | ButtonPressMask | KeyPressMask;
        mw = w ? w : DisplayWidth(dpy, screen);
        mh = dc.font.height + 2;

+       if(y < 0) {
+               if(y == INT_MIN)
+                       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),
        win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
                        DefaultDepth(dpy, screen), CopyFromParent,
                        DefaultVisual(dpy, screen),


@@ -612,29 +659,6 @@ setup(int x, int y, int w) {
        XMapRaised(dpy, win);
 }
 
        XMapRaised(dpy, win);
 }
 

-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;
-}
-

 unsigned int
 textnw(const char *text, unsigned int len) {
        XRectangle r;
 unsigned int
 textnw(const char *text, unsigned int len) {
        XRectangle r;


@@ -684,7 +708,11 @@ main(int argc, char *argv[]) {
                        if(++i < argc) x = atoi(argv[i]);
                }
                else if(!strcmp(argv[i], "-y")) {
                        if(++i < argc) x = atoi(argv[i]);
                }
                else if(!strcmp(argv[i], "-y")) {

-                       if(++i < argc) y = atoi(argv[i]);
+                       if(++i < argc)
+                               if(!strcmp(argv[i], "-0"))
+                                       y = INT_MIN;
+                               else
+                                       y = atoi(argv[i]);

                }
                else if(!strcmp(argv[i], "-w")) {
                        if(++i < argc) w = atoi(argv[i]);
                }
                else if(!strcmp(argv[i], "-w")) {
                        if(++i < argc) w = atoi(argv[i]);