Xinerama: correct variable declarations in preprocessor conditional

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 11b6e8d..1cfefcd 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -5,7 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>

-#include <unistd.h>
+#include <time.h>
+

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


@@ -21,131 +22,45 @@
 #define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
 #define LENGTH(X)             (sizeof X / sizeof X[0])
 #define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
 #define LENGTH(X)             (sizeof X / sizeof X[0])

-#define TEXTNW(X,N)           (drw_font_getexts_width(drw->fonts[0], (X), (N)))
-#define TEXTW(X)              (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
+#define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)

 
 /* enums */
 enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 
 
 /* enums */
 enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
 

-typedef struct Item Item;
-struct Item {
+struct item {

        char *text;
        char *text;

-       Item *left, *right;
-       Bool out;
+       struct item *left, *right;
+       int out;

 };
 
 };
 

-static void appenditem(Item *item, Item **list, Item **last);
-static void calcoffsets(void);
-static char *cistrstr(const char *s, const char *sub);
-static void cleanup(void);
-static void drawmenu(void);
-static void grabkeyboard(void);
-static void insert(const char *str, ssize_t n);
-static void keypress(XKeyEvent *ev);
-static void match(void);
-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 char text[BUFSIZ] = "";
 static char text[BUFSIZ] = "";

+static char *embed;

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

-static int inputw, promptw;
-static size_t cursor = 0;
+static int inputw = 0, promptw;
+static int lrpad; /* sum of left and right padding */
+static size_t cursor;
+static struct item *items = NULL;
+static struct item *matches, *matchend;
+static struct item *prev, *curr, *next, *sel;
+static int mon = -1, screen;
+

 static Atom clip, utf8;
 static Atom clip, utf8;

-static Item *items = NULL;
-static Item *matches, *matchend;
-static Item *prev, *curr, *next, *sel;
-static Window win;
+static Display *dpy;
+static Window root, parentwin, win;

 static XIC xic;
 static XIC xic;

-static int mon = -1;

 
 

-static ClrScheme scheme[SchemeLast];
-static Display *dpy;
-static int screen;
-static Window root;

 static Drw *drw;
 static Drw *drw;

-static int sw, sh; /* X display screen geometry width, height */
+static Clr *scheme[SchemeLast];

 
 #include "config.h"
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 
 
 #include "config.h"
 
 static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
 static char *(*fstrstr)(const char *, const char *) = strstr;
 

-int
-main(int argc, char *argv[]) {
-       Bool fast = False;
-       int i;
-
-       for(i = 1; i < argc; i++)
-               /* these options take no arguments */
-               if(!strcmp(argv[i], "-v")) {      /* prints version information */
-                       puts("dmenu-"VERSION", © 2006-2015 dmenu engineers, see LICENSE for details");
-                       exit(0);
-               }
-               else if(!strcmp(argv[i], "-b"))   /* appears at the bottom of the screen */
-                       topbar = False;
-               else if(!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
-                       fast = True;
-               else if(!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
-                       fstrncmp = strncasecmp;
-                       fstrstr = cistrstr;
-               }
-               else if(i+1 == argc)
-                       usage();
-               /* these options take one argument */
-               else if(!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
-                       lines = atoi(argv[++i]);
-               else if(!strcmp(argv[i], "-m"))
-                       mon = atoi(argv[++i]);
-               else if(!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
-                       prompt = argv[++i];
-               else if(!strcmp(argv[i], "-fn"))  /* font or font set */
-                       fonts[0] = argv[++i];
-               else if(!strcmp(argv[i], "-nb"))  /* normal background color */
-                       normbgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-nf"))  /* normal foreground color */
-                       normfgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-sb"))  /* selected background color */
-                       selbgcolor = argv[++i];
-               else if(!strcmp(argv[i], "-sf"))  /* selected foreground color */
-                       selfgcolor = argv[++i];
-               else
-                       usage();
-
-       if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-               fputs("warning: no locale support\n", stderr);
-       if(!(dpy = XOpenDisplay(NULL)))
-               die("dwm: cannot open display\n");
-       screen = DefaultScreen(dpy);
-       root = RootWindow(dpy, screen);
-       sw = DisplayWidth(dpy, screen);
-       sh = DisplayHeight(dpy, screen);
-       drw = drw_create(dpy, screen, root, sw, sh);
-       drw_load_fonts(drw, fonts, LENGTH(fonts));
-       if(!drw->fontcount)
-               die("No fonts could be loaded.\n");
-       drw_setscheme(drw, &scheme[SchemeNorm]);
-
-       if(fast) {
-               grabkeyboard();
-               readstdin();
-       }
-       else {
-               readstdin();
-               grabkeyboard();
-       }
-       setup();
-       run();
-
-       return 1; /* unreachable */
-}
-
-void
-appenditem(Item *item, Item **list, Item **last) {
-       if(*last)
+static void
+appenditem(struct item *item, struct item **list, struct item **last)
+{
+       if (*last)

                (*last)->right = item;
        else
                *list = item;
                (*last)->right = item;
        else
                *list = item;


@@ -155,153 +70,235 @@ appenditem(Item *item, Item **list, Item **last) {
        *last = item;
 }
 
        *last = item;
 }
 

-void
-calcoffsets(void) {
+static void
+calcoffsets(void)
+{

        int i, n;
 
        int i, n;
 

-       if(lines > 0)
+       if (lines > 0)

                n = lines * bh;
        else
                n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
        /* calculate which items will begin the next page and previous page */
                n = lines * bh;
        else
                n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
        /* calculate which items will begin the next page and previous page */

-       for(i = 0, next = curr; next; next = next->right)
-               if((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
+       for (i = 0, next = curr; next; next = next->right)
+               if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)

                        break;
                        break;

-       for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
-               if((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
+       for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
+               if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)

                        break;
 }
 
                        break;
 }
 

-void
-cleanup(void) {
+static void
+cleanup(void)
+{
+       size_t i;
+

        XUngrabKey(dpy, AnyKey, AnyModifier, root);
        XUngrabKey(dpy, AnyKey, AnyModifier, root);

-       drw_clr_free(scheme[SchemeNorm].bg);
-       drw_clr_free(scheme[SchemeNorm].fg);
-       drw_clr_free(scheme[SchemeSel].fg);
-       drw_clr_free(scheme[SchemeSel].bg);
-       drw_clr_free(scheme[SchemeOut].fg);
-       drw_clr_free(scheme[SchemeOut].bg);
+       for (i = 0; i < SchemeLast; i++)
+               free(scheme[i]);

        drw_free(drw);
        XSync(dpy, False);
        XCloseDisplay(dpy);
 }
 
        drw_free(drw);
        XSync(dpy, False);
        XCloseDisplay(dpy);
 }
 

-char *
-cistrstr(const char *s, const char *sub) {
+static char *
+cistrstr(const char *s, const char *sub)
+{

        size_t len;
 
        size_t len;
 

-       for(len = strlen(sub); *s; s++)
-               if(!strncasecmp(s, sub, len))
+       for (len = strlen(sub); *s; s++)
+               if (!strncasecmp(s, sub, len))

                        return (char *)s;
        return NULL;
 }
 
                        return (char *)s;
        return NULL;
 }
 

-void
-drawmenu(void) {
-       int curpos;
-       Item *item;
-       int x = 0, y = 0, h = bh, w;
+static int
+drawitem(struct item *item, int x, int y, int w)
+{
+       if (item == sel)
+               drw_setscheme(drw, scheme[SchemeSel]);
+       else if (item->out)
+               drw_setscheme(drw, scheme[SchemeOut]);
+       else
+               drw_setscheme(drw, scheme[SchemeNorm]);
+
+       return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
+}

 
 

-       drw_setscheme(drw, &scheme[SchemeNorm]);
-       drw_rect(drw, 0, 0, mw, mh, True, 1, 1);
+static void
+drawmenu(void)
+{
+       unsigned int curpos;
+       struct item *item;
+       int x = 0, y = 0, w;

 
 

-       if(prompt && *prompt) {
-               drw_setscheme(drw, &scheme[SchemeSel]);
-               drw_text(drw, x, 0, promptw, bh, prompt, 0);
-               x += promptw;
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       drw_rect(drw, 0, 0, mw, mh, 1, 1);
+
+       if (prompt && *prompt) {
+               drw_setscheme(drw, scheme[SchemeSel]);
+               x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);

        }
        /* draw input field */
        w = (lines > 0 || !matches) ? mw - x : inputw;
        }
        /* draw input field */
        w = (lines > 0 || !matches) ? mw - x : inputw;

-       drw_setscheme(drw, &scheme[SchemeNorm]);
-       drw_text(drw, x, 0, w, bh, text, 0);
+       drw_setscheme(drw, scheme[SchemeNorm]);
+       drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);

 
 

-       if((curpos = TEXTNW(text, cursor) + bh/2 - 2) < w) {
-               drw_setscheme(drw, &scheme[SchemeNorm]);
-               drw_rect(drw, x + curpos + 2, 2, 1, bh - 4, 1, 1, 0);
+       drw_font_getexts(drw->fonts, text, cursor, &curpos, NULL);
+       if ((curpos += lrpad / 2 - 1) < w) {
+               drw_setscheme(drw, scheme[SchemeNorm]);
+               drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);

        }
 
        }
 

-       if(lines > 0) {
+       if (lines > 0) {

                /* draw vertical list */
                /* draw vertical list */

-               w = mw - x;
-               for(item = curr; item != next; item = item->right) {
-                       y += h;
-                       if(item == sel)
-                               drw_setscheme(drw, &scheme[SchemeSel]);
-                       else if(item->out)
-                               drw_setscheme(drw, &scheme[SchemeOut]);
-                       else
-                               drw_setscheme(drw, &scheme[SchemeNorm]);
-
-                       drw_text(drw, x, y, w, bh, item->text, 0);
-               }
-       }
-       else if(matches) {
+               for (item = curr; item != next; item = item->right)
+                       drawitem(item, x, y += bh, mw - x);
+       } else if (matches) {

                /* draw horizontal list */
                x += inputw;
                w = TEXTW("<");
                /* draw horizontal list */
                x += inputw;
                w = TEXTW("<");

-               if(curr->left) {
-                       drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, "<", 0);
-               }
-               for(item = curr; item != next; item = item->right) {
-                       x += w;
-                       w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
-
-                       if(item == sel)
-                               drw_setscheme(drw, &scheme[SchemeSel]);
-                       else if(item->out)
-                               drw_setscheme(drw, &scheme[SchemeOut]);
-                       else
-                               drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, item->text, 0);
+               if (curr->left) {
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);

                }
                }

-               w = TEXTW(">");
-               x = mw - w;
-               if(next) {
-                       drw_setscheme(drw, &scheme[SchemeNorm]);
-                       drw_text(drw, x, 0, w, bh, ">", 0);
+               x += w;
+               for (item = curr; item != next; item = item->right)
+                       x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
+               if (next) {
+                       w = TEXTW(">");
+                       drw_setscheme(drw, scheme[SchemeNorm]);
+                       drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);

                }
        }
        drw_map(drw, win, 0, 0, mw, mh);
 }
 
                }
        }
        drw_map(drw, win, 0, 0, mw, mh);
 }
 

-void
-grabkeyboard(void) {
+static void
+grabfocus(void)
+{
+       struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000  };
+       Window focuswin;
+       int i, revertwin;
+
+       for (i = 0; i < 100; ++i) {
+               XGetInputFocus(dpy, &focuswin, &revertwin);
+               if (focuswin == win)
+                       return;
+               XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
+               nanosleep(&ts, NULL);
+       }
+       die("cannot grab focus");
+}
+
+static void
+grabkeyboard(void)
+{
+       struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };

        int i;
 
        int i;
 

+       if (embed)
+               return;

        /* try to grab keyboard, we may have to wait for another process to ungrab */
        /* try to grab keyboard, we may have to wait for another process to ungrab */

-       for(i = 0; i < 1000; i++) {
-               if(XGrabKeyboard(dpy, DefaultRootWindow(dpy), True,
-                                GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
+       for (i = 0; i < 1000; i++) {
+               if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
+                                 GrabModeAsync, CurrentTime) == GrabSuccess)

                        return;
                        return;

-               usleep(1000);
+               nanosleep(&ts, NULL);
+       }
+       die("cannot grab keyboard");
+}
+
+static void
+match(void)
+{
+       static char **tokv = NULL;
+       static int tokn = 0;
+
+       char buf[sizeof text], *s;
+       int i, tokc = 0;
+       size_t len, textsize;
+       struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+
+       strcpy(buf, text);
+       /* separate input text into tokens to be matched individually */
+       for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
+               if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+                       die("cannot realloc %u bytes:", tokn * sizeof *tokv);
+       len = tokc ? strlen(tokv[0]) : 0;
+
+       matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+       textsize = strlen(text);
+       for (item = items; item && item->text; item++) {
+               for (i = 0; i < tokc; i++)
+                       if (!fstrstr(item->text, tokv[i]))
+                               break;
+               if (i != tokc) /* not all tokens match */
+                       continue;
+               /* exact matches go first, then prefixes, then substrings */
+               if (!tokc || !fstrncmp(text, item->text, textsize))
+                       appenditem(item, &matches, &matchend);
+               else if (!fstrncmp(tokv[0], item->text, len))
+                       appenditem(item, &lprefix, &prefixend);
+               else
+                       appenditem(item, &lsubstr, &substrend);
+       }
+       if (lprefix) {
+               if (matches) {
+                       matchend->right = lprefix;
+                       lprefix->left = matchend;
+               } else
+                       matches = lprefix;
+               matchend = prefixend;
+       }
+       if (lsubstr) {
+               if (matches) {
+                       matchend->right = lsubstr;
+                       lsubstr->left = matchend;
+               } else
+                       matches = lsubstr;
+               matchend = substrend;

        }
        }

-       die("cannot grab keyboard\n");
+       curr = sel = matches;
+       calcoffsets();

 }
 
 }
 

-void
-insert(const char *str, ssize_t n) {
-       if(strlen(text) + n > sizeof text - 1)
+static void
+insert(const char *str, ssize_t n)
+{
+       if (strlen(text) + n > sizeof text - 1)

                return;
        /* move existing text out of the way, insert new text, and update cursor */
        memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
                return;
        /* move existing text out of the way, insert new text, and update cursor */
        memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));

-       if(n > 0)
+       if (n > 0)

                memcpy(&text[cursor], str, n);
        cursor += n;
        match();
 }
 
                memcpy(&text[cursor], str, n);
        cursor += n;
        match();
 }
 

-void
-keypress(XKeyEvent *ev) {
+static size_t
+nextrune(int inc)
+{
+       ssize_t n;
+
+       /* return location of next utf8 rune in the given direction (+1 or -1) */
+       for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
+               ;
+       return n;
+}
+
+static void
+keypress(XKeyEvent *ev)
+{

        char buf[32];
        int len;
        KeySym ksym = NoSymbol;
        Status status;
 
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
        char buf[32];
        int len;
        KeySym ksym = NoSymbol;
        Status status;
 
        len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);

-       if(status == XBufferOverflow)
+       if (status == XBufferOverflow)

                return;
                return;

-       if(ev->state & ControlMask)
+       if (ev->state & ControlMask)

                switch(ksym) {
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;
                switch(ksym) {
                case XK_a: ksym = XK_Home;      break;
                case XK_b: ksym = XK_Left;      break;


@@ -327,12 +324,13 @@ keypress(XKeyEvent *ev) {
                        insert(NULL, 0 - cursor);
                        break;
                case XK_w: /* delete word */
                        insert(NULL, 0 - cursor);
                        break;
                case XK_w: /* delete word */

-                       while(cursor > 0 && text[nextrune(-1)] == ' ')
+                       while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))

                                insert(NULL, nextrune(-1) - cursor);
                                insert(NULL, nextrune(-1) - cursor);

-                       while(cursor > 0 && text[nextrune(-1)] != ' ')
+                       while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))

                                insert(NULL, nextrune(-1) - cursor);
                        break;
                case XK_y: /* paste selection */
                                insert(NULL, nextrune(-1) - cursor);
                        break;
                case XK_y: /* paste selection */

+               case XK_Y:

                        XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
                                          utf8, utf8, win, CurrentTime);
                        return;
                        XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
                                          utf8, utf8, win, CurrentTime);
                        return;


@@ -345,7 +343,7 @@ keypress(XKeyEvent *ev) {
                default:
                        return;
                }
                default:
                        return;
                }

-       else if(ev->state & Mod1Mask)
+       else if (ev->state & Mod1Mask)

                switch(ksym) {
                case XK_g: ksym = XK_Home;  break;
                case XK_G: ksym = XK_End;   break;
                switch(ksym) {
                case XK_g: ksym = XK_Home;  break;
                case XK_G: ksym = XK_End;   break;


@@ -358,31 +356,31 @@ keypress(XKeyEvent *ev) {
                }
        switch(ksym) {
        default:
                }
        switch(ksym) {
        default:

-               if(!iscntrl(*buf))
+               if (!iscntrl(*buf))

                        insert(buf, len);
                break;
        case XK_Delete:
                        insert(buf, len);
                break;
        case XK_Delete:

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

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

-               if(cursor == 0)
+               if (cursor == 0)

                        return;
                insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:
                        return;
                insert(NULL, nextrune(-1) - cursor);
                break;
        case XK_End:

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

                        cursor = strlen(text);
                        break;
                }
                        cursor = strlen(text);
                        break;
                }

-               if(next) {
+               if (next) {

                        /* jump to end of list and position items in reverse */
                        curr = matchend;
                        calcoffsets();
                        curr = prev;
                        calcoffsets();
                        /* jump to end of list and position items in reverse */
                        curr = matchend;
                        calcoffsets();
                        curr = prev;
                        calcoffsets();

-                       while(next && (curr = curr->right))
+                       while (next && (curr = curr->right))

                                calcoffsets();
                }
                sel = matchend;
                                calcoffsets();
                }
                sel = matchend;


@@ -391,7 +389,7 @@ keypress(XKeyEvent *ev) {
                cleanup();
                exit(1);
        case XK_Home:
                cleanup();
                exit(1);
        case XK_Home:

-               if(sel == matches) {
+               if (sel == matches) {

                        cursor = 0;
                        break;
                }
                        cursor = 0;
                        break;
                }


@@ -399,27 +397,27 @@ keypress(XKeyEvent *ev) {
                calcoffsets();
                break;
        case XK_Left:
                calcoffsets();
                break;
        case XK_Left:

-               if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
+               if (cursor > 0 && (!sel || !sel->left || lines > 0)) {

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

-               if(lines > 0)
+               if (lines > 0)

                        return;
                /* fallthrough */
        case XK_Up:
                        return;
                /* fallthrough */
        case XK_Up:

-               if(sel && sel->left && (sel = sel->left)->right == curr) {
+               if (sel && sel->left && (sel = sel->left)->right == curr) {

                        curr = prev;
                        calcoffsets();
                }
                break;
        case XK_Next:
                        curr = prev;
                        calcoffsets();
                }
                break;
        case XK_Next:

-               if(!next)
+               if (!next)

                        return;
                sel = curr = next;
                calcoffsets();
                break;
        case XK_Prior:
                        return;
                sel = curr = next;
                calcoffsets();
                break;
        case XK_Prior:

-               if(!prev)
+               if (!prev)

                        return;
                sel = curr = prev;
                calcoffsets();
                        return;
                sel = curr = prev;
                calcoffsets();


@@ -427,29 +425,29 @@ keypress(XKeyEvent *ev) {
        case XK_Return:
        case XK_KP_Enter:
                puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
        case XK_Return:
        case XK_KP_Enter:
                puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);

-               if(!(ev->state & ControlMask)) {
+               if (!(ev->state & ControlMask)) {

                        cleanup();
                        exit(0);
                }
                        cleanup();
                        exit(0);
                }

-               if(sel)
-                       sel->out = True;
+               if (sel)
+                       sel->out = 1;

                break;
        case XK_Right:
                break;
        case XK_Right:

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

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

-               if(lines > 0)
+               if (lines > 0)

                        return;
                /* fallthrough */
        case XK_Down:
                        return;
                /* fallthrough */
        case XK_Down:

-               if(sel && sel->right && (sel = sel->right) == next) {
+               if (sel && sel->right && (sel = sel->right) == next) {

                        curr = next;
                        calcoffsets();
                }
                break;
        case XK_Tab:
                        curr = next;
                        calcoffsets();
                }
                break;
        case XK_Tab:

-               if(!sel)
+               if (!sel)

                        return;
                strncpy(text, sel->text, sizeof text - 1);
                text[sizeof text - 1] = '\0';
                        return;
                strncpy(text, sel->text, sizeof text - 1);
                text[sizeof text - 1] = '\0';


@@ -460,71 +458,9 @@ keypress(XKeyEvent *ev) {
        drawmenu();
 }
 
        drawmenu();
 }
 

-void
-match(void) {
-       static char **tokv = NULL;
-       static int tokn = 0;
-
-       char buf[sizeof text], *s;
-       int i, tokc = 0;
-       size_t len;
-       Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
-
-       strcpy(buf, text);
-       /* separate input text into tokens to be matched individually */
-       for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
-               if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
-                       die("cannot realloc %u bytes\n", tokn * sizeof *tokv);
-       len = tokc ? strlen(tokv[0]) : 0;
-
-       matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
-       for(item = items; item && item->text; item++) {
-               for(i = 0; i < tokc; i++)
-                       if(!fstrstr(item->text, tokv[i]))
-                               break;
-               if(i != tokc) /* not all tokens match */
-                       continue;
-               /* exact matches go first, then prefixes, then substrings */
-               if(!tokc || !fstrncmp(tokv[0], item->text, len+1))
-                       appenditem(item, &matches, &matchend);
-               else if(!fstrncmp(tokv[0], item->text, len))
-                       appenditem(item, &lprefix, &prefixend);
-               else
-                       appenditem(item, &lsubstr, &substrend);
-       }
-       if(lprefix) {
-               if(matches) {
-                       matchend->right = lprefix;
-                       lprefix->left = matchend;
-               }
-               else
-                       matches = lprefix;
-               matchend = prefixend;
-       }
-       if(lsubstr) {
-               if(matches) {
-                       matchend->right = lsubstr;
-                       lsubstr->left = matchend;
-               }
-               else
-                       matches = lsubstr;
-               matchend = substrend;
-       }
-       curr = sel = matches;
-       calcoffsets();
-}
-
-size_t
-nextrune(int inc) {
-       ssize_t n;
-
-       /* return location of next utf8 rune in the given direction (+1 or -1) */
-       for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
-       return n;
-}
-
-void
-paste(void) {
+static void
+paste(void)
+{

        char *p, *q;
        int di;
        unsigned long dl;
        char *p, *q;
        int di;
        unsigned long dl;


@@ -533,138 +469,149 @@ paste(void) {
        /* we have been given the current selection, now insert it into input */
        XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
                           utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
        /* we have been given the current selection, now insert it into input */
        XGetWindowProperty(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 : (ssize_t)strlen(p));
+       insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));

        XFree(p);
        drawmenu();
 }
 
        XFree(p);
        drawmenu();
 }
 

-void
-readstdin(void) {
-       char buf[sizeof text], *p, *maxstr = NULL;
-       size_t i, max = 0, size = 0;
+static void
+readstdin(void)
+{
+       char buf[sizeof text], *p;
+       size_t i, imax = 0, size = 0;
+       unsigned int tmpmax = 0;

 
        /* read each line from stdin and add it to the item list */
 
        /* read each line from stdin and add it to the item list */

-       for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
-               if(i+1 >= size / sizeof *items)
-                       if(!(items = realloc(items, (size += BUFSIZ))))
+       for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
+               if (i + 1 >= size / sizeof *items)
+                       if (!(items = realloc(items, (size += BUFSIZ))))

                                die("cannot realloc %u bytes:", size);
                                die("cannot realloc %u bytes:", size);

-               if((p = strchr(buf, '\n')))
+               if ((p = strchr(buf, '\n')))

                        *p = '\0';
                        *p = '\0';

-               if(!(items[i].text = strdup(buf)))
-                       die("cannot strdup %u bytes:", strlen(buf)+1);
-               items[i].out = False;
-               if(strlen(items[i].text) > max)
-                       max = strlen(maxstr = items[i].text);
+               if (!(items[i].text = strdup(buf)))
+                       die("cannot strdup %u bytes:", strlen(buf) + 1);
+               items[i].out = 0;
+               drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
+               if (tmpmax > inputw) {
+                       inputw = tmpmax;
+                       imax = i;
+               }

        }
        }

-       if(items)
+       if (items)

                items[i].text = NULL;
                items[i].text = NULL;

-       inputw = maxstr ? TEXTW(maxstr) : 0;
+       inputw = items ? TEXTW(items[imax].text) : 0;

        lines = MIN(lines, i);
 }
 
        lines = MIN(lines, i);
 }
 

-void
-run(void) {
+static void
+run(void)
+{

        XEvent ev;
 
        XEvent ev;
 

-       while(!XNextEvent(dpy, &ev)) {
-               if(XFilterEvent(&ev, win))
+       while (!XNextEvent(dpy, &ev)) {
+               if (XFilterEvent(&ev, win))

                        continue;
                switch(ev.type) {
                case Expose:
                        continue;
                switch(ev.type) {
                case Expose:

-                       if(ev.xexpose.count == 0)
+                       if (ev.xexpose.count == 0)

                                drw_map(drw, win, 0, 0, mw, mh);
                        break;
                                drw_map(drw, win, 0, 0, mw, mh);
                        break;

+               case FocusIn:
+                       /* regrab focus from parent window */
+                       if (ev.xfocus.window != win)
+                               grabfocus();
+                       break;

                case KeyPress:
                        keypress(&ev.xkey);
                        break;
                case SelectionNotify:
                case KeyPress:
                        keypress(&ev.xkey);
                        break;
                case SelectionNotify:

-                       if(ev.xselection.property == utf8)
+                       if (ev.xselection.property == utf8)

                                paste();
                        break;
                case VisibilityNotify:
                                paste();
                        break;
                case VisibilityNotify:

-                       if(ev.xvisibility.state != VisibilityUnobscured)
+                       if (ev.xvisibility.state != VisibilityUnobscured)

                                XRaiseWindow(dpy, win);
                        break;
                }
        }
 }
 
                                XRaiseWindow(dpy, win);
                        break;
                }
        }
 }
 

-void
-setup(void) {
-       int x, y;
+static void
+setup(void)
+{
+       int x, y, i = 0;
+       unsigned int du;

        XSetWindowAttributes swa;
        XIM xim;
        XSetWindowAttributes swa;
        XIM xim;

+       Window w, dw, *dws;
+       XWindowAttributes wa;

 #ifdef XINERAMA
        XineramaScreenInfo *info;
 #ifdef XINERAMA
        XineramaScreenInfo *info;

-       Window w, pw, dw, *dws;
-       XWindowAttributes wa;
-       int a, j, di, n, i = 0, area = 0;
-       unsigned int du;
+       Window pw;
+       int a, j, di, n, area = 0;

 #endif
 
        /* init appearance */
 #endif
 
        /* init appearance */

-       scheme[SchemeNorm].bg = drw_clr_create(drw, normbgcolor);
-       scheme[SchemeNorm].fg = drw_clr_create(drw, normfgcolor);
-       scheme[SchemeSel].bg = drw_clr_create(drw, selbgcolor);
-       scheme[SchemeSel].fg = drw_clr_create(drw, selfgcolor);
-       scheme[SchemeOut].bg = drw_clr_create(drw, outbgcolor);
-       scheme[SchemeOut].fg = drw_clr_create(drw, outfgcolor);
+       scheme[SchemeNorm] = drw_scm_create(drw, colors[SchemeNorm], 2);
+       scheme[SchemeSel] = drw_scm_create(drw, colors[SchemeSel], 2);
+       scheme[SchemeOut] = drw_scm_create(drw, colors[SchemeOut], 2);

 
        clip = XInternAtom(dpy, "CLIPBOARD",   False);
        utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
        /* calculate menu geometry */
 
        clip = XInternAtom(dpy, "CLIPBOARD",   False);
        utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
        /* calculate menu geometry */

-       bh = drw->fonts[0]->h + 2;
+       bh = drw->fonts->h + 2;

        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
 #ifdef XINERAMA

-       if((info = XineramaQueryScreens(dpy, &n))) {
+       if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {

                XGetInputFocus(dpy, &w, &di);
                XGetInputFocus(dpy, &w, &di);

-               if(mon != -1 && mon < n)
+               if (mon >= 0 && mon < n)

                        i = mon;
                        i = mon;

-               if(!i && w != root && w != PointerRoot && w != None) {
+               else if (w != root && w != PointerRoot && w != None) {

                        /* find top-level window containing current input focus */
                        do {
                        /* find top-level window containing current input focus */
                        do {

-                               if(XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
+                               if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)

                                        XFree(dws);
                                        XFree(dws);

-                       } while(w != root && w != pw);
+                       } while (w != root && w != pw);

                        /* find xinerama screen with which the window intersects most */
                        /* find xinerama screen with which the window intersects most */

-                       if(XGetWindowAttributes(dpy, pw, &wa))
-                               for(j = 0; j < n; j++)
-                                       if((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
+                       if (XGetWindowAttributes(dpy, pw, &wa))
+                               for (j = 0; j < n; j++)
+                                       if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {

                                                area = a;
                                                i = j;
                                        }
                }
                /* no focused window is on screen, so use pointer location instead */
                                                area = a;
                                                i = j;
                                        }
                }
                /* no focused window is on screen, so use pointer location instead */

-               if(mon == -1 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
-                       for(i = 0; i < n; i++)
-                               if(INTERSECT(x, y, 1, 1, info[i]))
+               if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+                       for (i = 0; i < n; i++)
+                               if (INTERSECT(x, y, 1, 1, info[i]))

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

-       }
-       else
+       } else

 #endif
        {
 #endif
        {

+               if (!XGetWindowAttributes(dpy, parentwin, &wa))
+                       die("could not get embedding window attributes: 0x%lx",
+                           parentwin);

                x = 0;
                x = 0;

-               y = topbar ? 0 : sh - mh;
-               mw = sw;
+               y = topbar ? 0 : wa.height - mh;
+               mw = wa.width;

        }
        }

-       promptw = (prompt && *prompt) ? TEXTW(prompt) : 0;
+       promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;

        inputw = MIN(inputw, mw/3);
        match();
 
        /* create menu window */
        swa.override_redirect = True;
        inputw = MIN(inputw, mw/3);
        match();
 
        /* create menu window */
        swa.override_redirect = True;

-       swa.background_pixel = scheme[SchemeNorm].bg->pix;
+       swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;

        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;

-       win = XCreateWindow(dpy, root, x, y, mw, mh, 0,
-                           DefaultDepth(dpy, screen), CopyFromParent,
-                           DefaultVisual(dpy, screen),
+       win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
+                           CopyFromParent, CopyFromParent, CopyFromParent,

                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
 
        /* open input methods */
                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
 
        /* open input methods */


@@ -673,13 +620,94 @@ setup(void) {
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);
                        XNClientWindow, win, XNFocusWindow, win, NULL);
 
        XMapRaised(dpy, win);

+       if (embed) {
+               XSelectInput(dpy, parentwin, FocusChangeMask);
+               if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
+                       for (i = 0; i < du && dws[i] != win; ++i)
+                               XSelectInput(dpy, dws[i], FocusChangeMask);
+                       XFree(dws);
+               }
+               grabfocus();
+       }

        drw_resize(drw, mw, mh);
        drawmenu();
 }
 
        drw_resize(drw, mw, mh);
        drawmenu();
 }
 

-void
-usage(void) {
-       fputs("usage: dmenu [-b] [-f] [-i] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-             "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
+static void
+usage(void)
+{
+       fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+             "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);

        exit(1);
 }
        exit(1);
 }

+
+int
+main(int argc, char *argv[])
+{
+       XWindowAttributes wa;
+       int i, fast = 0;
+
+       for (i = 1; i < argc; i++)
+               /* these options take no arguments */
+               if (!strcmp(argv[i], "-v")) {      /* prints version information */
+                       puts("dmenu-"VERSION);
+                       exit(0);
+               } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
+                       topbar = 0;
+               else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
+                       fast = 1;
+               else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
+                       fstrncmp = strncasecmp;
+                       fstrstr = cistrstr;
+               } else if (i + 1 == argc)
+                       usage();
+               /* these options take one argument */
+               else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
+                       lines = atoi(argv[++i]);
+               else if (!strcmp(argv[i], "-m"))
+                       mon = atoi(argv[++i]);
+               else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
+                       prompt = argv[++i];
+               else if (!strcmp(argv[i], "-fn"))  /* font or font set */
+                       fonts[0] = argv[++i];
+               else if (!strcmp(argv[i], "-nb"))  /* normal background color */
+                       colors[SchemeNorm][ColBg] = argv[++i];
+               else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
+                       colors[SchemeNorm][ColFg] = argv[++i];
+               else if (!strcmp(argv[i], "-sb"))  /* selected background color */
+                       colors[SchemeSel][ColBg] = argv[++i];
+               else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
+                       colors[SchemeSel][ColFg] = argv[++i];
+               else if (!strcmp(argv[i], "-w"))   /* embedding window id */
+                       embed = argv[++i];
+               else
+                       usage();
+
+       if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+               fputs("warning: no locale support\n", stderr);
+       if (!(dpy = XOpenDisplay(NULL)))
+               die("cannot open display");
+       screen = DefaultScreen(dpy);
+       root = RootWindow(dpy, screen);
+       if (!embed || !(parentwin = strtol(embed, NULL, 0)))
+               parentwin = root;
+       if (!XGetWindowAttributes(dpy, parentwin, &wa))
+               die("could not get embedding window attributes: 0x%lx",
+                   parentwin);
+       drw = drw_create(dpy, screen, root, wa.width, wa.height);
+       if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+               die("no fonts could be loaded.");
+       lrpad = drw->fonts->h;
+
+       if (fast) {
+               grabkeyboard();
+               readstdin();
+       } else {
+               readstdin();
+               grabkeyboard();
+       }
+       setup();
+       run();
+
+       return 1; /* unreachable */
+}