new dmenu_run

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 9d6088b..d03087f 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <strings.h>

 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <unistd.h>
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>


@@ -19,8 +20,7 @@
 typedef struct Item Item;
 struct Item {
        char *text;
 typedef struct Item Item;
 struct Item {
        char *text;

-       Item *next;          /* traverses all items */
-       Item *left, *right;  /* traverses matching items */
+       Item *left, *right;

 };
 
 static void appenditem(Item *item, Item **list, Item **last);
 };
 
 static void appenditem(Item *item, Item **list, Item **last);


@@ -28,22 +28,20 @@ static void calcoffsets(void);
 static void drawmenu(void);
 static char *fstrstr(const char *s, const char *sub);
 static void grabkeyboard(void);
 static void drawmenu(void);
 static char *fstrstr(const char *s, const char *sub);
 static void grabkeyboard(void);

-static void insert(const char *s, ssize_t n);
+static void insert(const char *str, ssize_t n);

 static void keypress(XKeyEvent *ev);
 static void keypress(XKeyEvent *ev);

-static void match(void);
-static size_t nextrune(int incr);
+static void match(Bool sub);
+static size_t nextrune(int inc);

 static void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(void);
 static void usage(void);
 
 static void paste(void);
 static void readstdin(void);
 static void run(void);
 static void setup(void);
 static void usage(void);
 

-static char text[BUFSIZ];
+static char text[BUFSIZ] = "";

 static int bh, mw, mh;
 static int bh, mw, mh;

-static int inputw = 0;
+static int inputw, promptw;

 static int lines = 0;
 static int lines = 0;

-static int monitor = -1;
-static int promptw;

 static size_t cursor = 0;
 static const char *font = NULL;
 static const char *prompt = NULL;
 static size_t cursor = 0;
 static const char *font = NULL;
 static const char *prompt = NULL;


@@ -57,12 +55,66 @@ static Atom utf8;
 static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;
 static Bool topbar = True;
 static DC *dc;
 static Item *items = NULL;

-static Item *matches, *sel;
-static Item *prev, *curr, *next;
-static Window root, win;
+static Item *matches, *matchend;
+static Item *prev, *curr, *next, *sel;
+static Window win;

 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 

+int
+main(int argc, char *argv[]) {
+       Bool fast = False;
+       int i;
+
+       for(i = 1; i < argc; i++)
+               /* single flags */
+               if(!strcmp(argv[i], "-v")) {
+                       puts("dmenu-"VERSION", © 2006-2011 dmenu engineers, see LICENSE for details");
+                       exit(EXIT_SUCCESS);
+               }
+               else if(!strcmp(argv[i], "-b"))
+                       topbar = False;
+               else if(!strcmp(argv[i], "-f"))
+                       fast = True;
+               else if(!strcmp(argv[i], "-i"))
+                       fstrncmp = strncasecmp;
+               else if(i+1 == argc)
+                       usage();
+               /* double flags */
+               else if(!strcmp(argv[i], "-l"))
+                       lines = atoi(argv[++i]);
+               else if(!strcmp(argv[i], "-p"))
+                       prompt = argv[++i];
+               else if(!strcmp(argv[i], "-fn"))
+                       font = argv[++i];
+               else if(!strcmp(argv[i], "-nb"))
+                       normbgcolor = argv[++i];
+               else if(!strcmp(argv[i], "-nf"))
+                       normfgcolor = argv[++i];
+               else if(!strcmp(argv[i], "-sb"))
+                       selbgcolor = argv[++i];
+               else if(!strcmp(argv[i], "-sf"))
+                       selfgcolor = argv[++i];
+               else
+                       usage();
+
+       dc = initdc();
+       initfont(dc, font);
+
+       if(fast) {
+               grabkeyboard();
+               readstdin();
+       }
+       else {
+               readstdin();
+               grabkeyboard();
+       }
+       setup();
+       run();
+
+       return EXIT_FAILURE;  /* should not reach */
+}
+

 void
 appenditem(Item *item, Item **list, Item **last) {
        if(!*last)
 void
 appenditem(Item *item, Item **list, Item **last) {
        if(!*last)


@@ -76,7 +128,7 @@ appenditem(Item *item, Item **list, Item **last) {
 
 void
 calcoffsets(void) {
 
 void
 calcoffsets(void) {

-       unsigned int i, n;
+       int i, n;

 
        if(lines > 0)
                n = lines * bh;
 
        if(lines > 0)
                n = lines * bh;


@@ -151,7 +203,8 @@ grabkeyboard(void) {
        int i;
 
        for(i = 0; i < 1000; i++) {
        int i;
 
        for(i = 0; i < 1000; i++) {

-               if(!XGrabKeyboard(dc->dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime))
+               if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
+                                GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)

                        return;
                usleep(1000);
        }
                        return;
                usleep(1000);
        }


@@ -159,26 +212,27 @@ grabkeyboard(void) {
 }
 
 void
 }
 
 void

-insert(const char *s, ssize_t n) {
+insert(const char *str, ssize_t n) {

        if(strlen(text) + n > sizeof text - 1)
                return;
        if(strlen(text) + n > sizeof text - 1)
                return;

-       memmove(text + cursor + n, text + cursor, sizeof text - cursor - MAX(n, 0));
+       memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));

        if(n > 0)
        if(n > 0)

-               memcpy(text + cursor, s, n);
+               memcpy(&text[cursor], str, n);

        cursor += n;
        cursor += n;

-       match();
+       match(n > 0 && text[cursor] == '\0');

 }
 
 void
 keypress(XKeyEvent *ev) {
        char buf[32];
 }
 
 void
 keypress(XKeyEvent *ev) {
        char buf[32];

-       size_t len;

        KeySym ksym;
 
        KeySym ksym;
 

-       len = strlen(text);

        XLookupString(ev, buf, sizeof buf, &ksym, NULL);
        if(ev->state & ControlMask) {
        XLookupString(ev, buf, sizeof buf, &ksym, NULL);
        if(ev->state & ControlMask) {

-               switch(tolower(ksym)) {
+               KeySym lower, upper;
+
+               XConvertCase(ksym, &lower, &upper);
+               switch(lower) {

                default:
                        return;
                case XK_a:
                default:
                        return;
                case XK_a:


@@ -206,11 +260,12 @@ keypress(XKeyEvent *ev) {
                        ksym = XK_Tab;
                        break;
                case XK_j:
                        ksym = XK_Tab;
                        break;
                case XK_j:

+               case XK_m:

                        ksym = XK_Return;
                        break;
                case XK_k:  /* delete right */
                        text[cursor] = '\0';
                        ksym = XK_Return;
                        break;
                case XK_k:  /* delete right */
                        text[cursor] = '\0';

-                       match();
+                       match(False);

                        break;
                case XK_n:
                        ksym = XK_Down;
                        break;
                case XK_n:
                        ksym = XK_Down;


@@ -227,6 +282,9 @@ keypress(XKeyEvent *ev) {
                        while(cursor > 0 && text[nextrune(-1)] != ' ')
                                insert(NULL, nextrune(-1) - cursor);
                        break;
                        while(cursor > 0 && text[nextrune(-1)] != ' ')
                                insert(NULL, nextrune(-1) - cursor);
                        break;

+               case XK_y:  /* paste selection */
+                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
+                       return;

                }
        }
        switch(ksym) {
                }
        }
        switch(ksym) {


@@ -235,7 +293,7 @@ keypress(XKeyEvent *ev) {
                        insert(buf, strlen(buf));
                break;
        case XK_Delete:
                        insert(buf, strlen(buf));
                break;
        case XK_Delete:

-               if(cursor == len)
+               if(text[cursor] == '\0')

                        return;
                cursor = nextrune(+1);
        case XK_BackSpace:
                        return;
                cursor = nextrune(+1);
        case XK_BackSpace:


@@ -243,16 +301,19 @@ keypress(XKeyEvent *ev) {
                        insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:
                        insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:

-               if(cursor < len) {
-                       cursor = len;
+               if(text[cursor] != '\0') {
+                       cursor = strlen(text);

                        break;
                }
                        break;
                }

-               while(next) {
-                       sel = curr = next;
+               if(next) {
+                       curr = matchend;

                        calcoffsets();
                        calcoffsets();

+                       curr = prev;
+                       calcoffsets();
+                       while(next && (curr = curr->right))
+                               calcoffsets();

                }
                }

-               while(sel && sel->right)
-                       sel = sel->right;
+               sel = matchend;

                break;
        case XK_Escape:
                exit(EXIT_FAILURE);
                break;
        case XK_Escape:
                exit(EXIT_FAILURE);


@@ -264,10 +325,6 @@ keypress(XKeyEvent *ev) {
                sel = curr = matches;
                calcoffsets();
                break;
                sel = curr = matches;
                calcoffsets();
                break;

-       case XK_Insert:  /* paste selection */
-               if(ev->state & ShiftMask)
-                       XConvertSelection(dc->dpy, XA_PRIMARY, utf8, utf8, win, CurrentTime);
-               return;

        case XK_Left:
                if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
                        cursor = nextrune(-1);
        case XK_Left:
                if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
                        cursor = nextrune(-1);


@@ -296,10 +353,9 @@ keypress(XKeyEvent *ev) {
        case XK_Return:
        case XK_KP_Enter:
                fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);
        case XK_Return:
        case XK_KP_Enter:
                fputs((sel && !(ev->state & ShiftMask)) ? sel->text : text, stdout);

-               fflush(stdout);

                exit(EXIT_SUCCESS);
        case XK_Right:
                exit(EXIT_SUCCESS);
        case XK_Right:

-               if(cursor < len) {
+               if(text[cursor] != '\0') {

                        cursor = nextrune(+1);
                        break;
                }
                        cursor = nextrune(+1);
                        break;
                }


@@ -316,58 +372,58 @@ keypress(XKeyEvent *ev) {
                        return;
                strncpy(text, sel->text, sizeof text);
                cursor = strlen(text);
                        return;
                strncpy(text, sel->text, sizeof text);
                cursor = strlen(text);

-               match();
+               match(True);

                break;
        }
        drawmenu();
 }
 
 void
                break;
        }
        drawmenu();
 }
 
 void

-match(void) {
-       size_t len;
-       Item *item, *itemend, *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
-
-       len = strlen(text);
-       matches = lexact = lprefix = lsubstr = itemend = exactend = prefixend = substrend = NULL;
-       for(item = items; item; item = item->next)
+match(Bool sub) {
+       size_t len = strlen(text);
+       Item *lexact, *lprefix, *lsubstr, *exactend, *prefixend, *substrend;
+       Item *item, *lnext;
+
+       lexact = lprefix = lsubstr = exactend = prefixend = substrend = NULL;
+       for(item = sub ? matches : items; item && item->text; item = lnext) {
+               lnext = sub ? item->right : item + 1;

                if(!fstrncmp(text, item->text, len + 1))
                        appenditem(item, &lexact, &exactend);
                else if(!fstrncmp(text, item->text, len))
                        appenditem(item, &lprefix, &prefixend);
                else if(fstrstr(item->text, text))
                        appenditem(item, &lsubstr, &substrend);
                if(!fstrncmp(text, item->text, len + 1))
                        appenditem(item, &lexact, &exactend);
                else if(!fstrncmp(text, item->text, len))
                        appenditem(item, &lprefix, &prefixend);
                else if(fstrstr(item->text, text))
                        appenditem(item, &lsubstr, &substrend);

-
-       if(lexact) {
-               matches = lexact;
-               itemend = exactend;

        }
        }

+       matches = lexact;
+       matchend = exactend;
+

        if(lprefix) {
        if(lprefix) {

-               if(itemend) {
-                       itemend->right = lprefix;
-                       lprefix->left = itemend;
+               if(matchend) {
+                       matchend->right = lprefix;
+                       lprefix->left = matchend;

                }
                else
                        matches = lprefix;
                }
                else
                        matches = lprefix;

-               itemend = prefixend;
+               matchend = prefixend;

        }
        if(lsubstr) {
        }
        if(lsubstr) {

-               if(itemend) {
-                       itemend->right = lsubstr;
-                       lsubstr->left = itemend;
+               if(matchend) {
+                       matchend->right = lsubstr;
+                       lsubstr->left = matchend;

                }
                else
                        matches = lsubstr;
                }
                else
                        matches = lsubstr;

+               matchend = substrend;

        }
        }

-       curr = prev = next = sel = matches;
+       curr = sel = matches;

        calcoffsets();
 }
 
 size_t
        calcoffsets();
 }
 
 size_t

-nextrune(int incr) {
-       size_t n, len;
+nextrune(int inc) {
+       ssize_t n;

 
 

-       len = strlen(text);
-       for(n = cursor + incr; n >= 0 && n < len && (text[n] & 0xc0) == 0x80; n += incr);
+       for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);

        return n;
 }
 
        return n;
 }
 


@@ -380,26 +436,30 @@ paste(void) {
 
        XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
                           utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
 
        XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
                           utf8, &da, &di, &dl, &dl, (unsigned char **)&p);

-       insert(p, (q = strchr(p, '\n')) ? q-p : strlen(p));
+       insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));

        XFree(p);
        drawmenu();
 }
 
 void
 readstdin(void) {
        XFree(p);
        drawmenu();
 }
 
 void
 readstdin(void) {

-       char buf[sizeof text], *p;
-       Item *item, **end;
+       char buf[sizeof text], *p, *maxstr = NULL;
+       size_t i, max = 0, size = 0;

 
 

-       for(end = &items; fgets(buf, sizeof buf, stdin); *end = item, end = &item->next) {
+       for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
+               if(i+1 >= size / sizeof *items)
+                       if(!(items = realloc(items, (size += BUFSIZ))))
+                               eprintf("cannot realloc %u bytes:", size);

                if((p = strchr(buf, '\n')))
                        *p = '\0';
                if((p = strchr(buf, '\n')))
                        *p = '\0';

-               if(!(item = malloc(sizeof *item)))
-                       eprintf("cannot malloc %u bytes\n", sizeof *item);
-               if(!(item->text = strdup(buf)))
-                       eprintf("cannot strdup %u bytes\n", strlen(buf)+1);
-               item->next = item->left = item->right = NULL;
-               inputw = MAX(inputw, textw(dc, item->text));
+               if(!(items[i].text = strdup(buf)))
+                       eprintf("cannot strdup %u bytes:", strlen(buf)+1);
+               if(strlen(items[i].text) > max)
+                       max = strlen(maxstr = items[i].text);

        }
        }

+       if(items)
+               items[i].text = NULL;
+       inputw = maxstr ? textw(dc, maxstr) : 0;

 }
 
 void
 }
 
 void


@@ -428,21 +488,20 @@ run(void) {
 
 void
 setup(void) {
 
 void
 setup(void) {

-       int x, y, screen;
+       int x, y, screen = DefaultScreen(dc->dpy);
+       Window root = RootWindow(dc->dpy, screen);

        XSetWindowAttributes wa;
 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
 #endif
 
        XSetWindowAttributes wa;
 #ifdef XINERAMA
        int n;
        XineramaScreenInfo *info;
 #endif
 

-       screen = DefaultScreen(dc->dpy);
-       root = RootWindow(dc->dpy, screen);
-       utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
-

        normcol[ColBG] = getcolor(dc, normbgcolor);
        normcol[ColFG] = getcolor(dc, normfgcolor);
        normcol[ColBG] = getcolor(dc, normbgcolor);
        normcol[ColFG] = getcolor(dc, normfgcolor);

-       selcol[ColBG] = getcolor(dc, selbgcolor);
-       selcol[ColFG] = getcolor(dc, selfgcolor);
+       selcol[ColBG]  = getcolor(dc, selbgcolor);
+       selcol[ColFG]  = getcolor(dc, selfgcolor);
+
+       utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);

 
        /* menu geometry */
        bh = dc->font.height + 2;
 
        /* menu geometry */
        bh = dc->font.height + 2;


@@ -455,9 +514,8 @@ setup(void) {
                Window dw;
 
                XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);
                Window dw;
 
                XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du);

-               for(i = 0; i < n; i++)
-                       if((monitor == info[i].screen_number)
-                       || (monitor < 0 && INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height)))
+               for(i = 0; i < n-1; i++)
+                       if(INRECT(x, y, info[i].x_org, info[i].y_org, info[i].width, info[i].height))

                                break;
                x = info[i].x_org;
                y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
                                break;
                x = info[i].x_org;
                y = info[i].y_org + (topbar ? 0 : info[i].height - mh);


@@ -471,6 +529,10 @@ setup(void) {
                y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
                mw = DisplayWidth(dc->dpy, screen);
        }
                y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh;
                mw = DisplayWidth(dc->dpy, screen);
        }

+       promptw = prompt ? textw(dc, prompt) : 0;
+       inputw = MIN(inputw, mw/3);
+       match(False);
+

        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;
        /* menu window */
        wa.override_redirect = True;
        wa.background_pixmap = ParentRelative;


@@ -480,64 +542,14 @@ setup(void) {
                            DefaultVisual(dc->dpy, screen),
                            CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 
                            DefaultVisual(dc->dpy, screen),
                            CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
 

-       grabkeyboard();
-       resizedc(dc, mw, mh);
-       inputw = MIN(inputw, mw/3);
-       promptw = prompt ? textw(dc, prompt) : 0;

        XMapRaised(dc->dpy, win);
        XMapRaised(dc->dpy, win);

-       text[0] = '\0';
-       match();
+       resizedc(dc, mw, mh);
+       drawmenu();

 }
 
 void
 usage(void) {
 }
 
 void
 usage(void) {

-       fputs("usage: dmenu [-b] [-i] [-l lines] [-p prompt] [-fn font] [-nb color]\n"
-             "             [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font]\n"
+             "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);

        exit(EXIT_FAILURE);
 }
        exit(EXIT_FAILURE);
 }

-
-int
-main(int argc, char *argv[]) {
-       int i;
-
-       progname = "dmenu";
-       for(i = 1; i < argc; i++)
-               /* single flags */
-               if(!strcmp(argv[i], "-v")) {
-                       fputs("dmenu-"VERSION", © 2006-2010 dmenu engineers, see LICENSE for details\n", stdout);
-                       exit(EXIT_SUCCESS);
-               }
-               else if(!strcmp(argv[i], "-b"))
-                       topbar = False;
-               else if(!strcmp(argv[i], "-i"))
-                       fstrncmp = strncasecmp;
-               else if(i == argc-1)
-                       usage();
-               /* double flags */
-               else if(!strcmp(argv[i], "-l"))
-                       lines = atoi(argv[++i]);
-               else if(!strcmp(argv[i], "-m"))
-                       monitor = atoi(argv[++i]);
-               else if(!strcmp(argv[i], "-p"))
-                       prompt = argv[++i];
-               else if(!strcmp(argv[i], "-fn"))
-                       font = argv[++i];
-               else if(!strcmp(argv[i], "-nb"))
-                       normbgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-nf"))
-                       normfgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-sb"))
-                       selbgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-sf"))
-                       selfgcolor = argv[++i];
-               else
-                       usage();
-
-       dc = initdc();
-       initfont(dc, font);
-       readstdin();
-       setup();
-       run();
-
-       return EXIT_FAILURE;  /* should not reach */
-}