applied reject no match patch

[dmenu.git] / dmenu.c

diff --git a/dmenu.c b/dmenu.c
index 96b2581..9a965e1 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -40,6 +40,7 @@ static char *embed;
 static int bh, mw, mh;
 static int inputw = 0, promptw;
 static int lrpad; /* sum of left and right padding */
+static int reject_no_match = 0;
 static size_t cursor;
 static struct item *items = NULL;
 static struct item *matches, *matchend;
@@ -94,6 +95,15 @@ calcoffsets(void)
                        break;
 }
 
+static int
+max_textw(void)
+{
+       int len = 0;
+       for (struct item *item = items; item && item->text; item++)
+               len = MAX(TEXTW(item->text), len);
+       return len;
+}
+
 static void
 cleanup(void)
 {
@@ -274,12 +284,26 @@ insert(const char *str, ssize_t n)
 {
        if (strlen(text) + n > sizeof text - 1)
                return;
+
+       static char last[BUFSIZ] = "";
+       if(reject_no_match) {
+               /* store last text value in case we need to revert it */
+               memcpy(last, text, BUFSIZ);
+       }
+
        /* 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)
                memcpy(&text[cursor], str, n);
        cursor += n;
        match();
+
+       if(!matches && reject_no_match) {
+               /* revert to last text value if theres no match */
+               memcpy(text, last, BUFSIZ);
+               cursor -= n;
+               match();
+       }
 }
 
 static size_t
@@ -621,6 +645,7 @@ setup(void)
        bh = drw->fonts->h + 2;
        lines = MAX(lines, 0);
        mh = (lines + 1) * bh;
+       promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
 #ifdef XINERAMA
        i = 0;
        if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
@@ -647,9 +672,16 @@ setup(void)
                                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;
+               if (centered) {
+                       mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
+                       x = info[i].x_org + ((info[i].width  - mw) / 2);
+                       y = info[i].y_org + ((info[i].height - mh) / 2);
+               } else {
+                       x = info[i].x_org;
+                       y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
+                       mw = info[i].width;
+               }
+
                XFree(info);
        } else
 #endif
@@ -657,11 +689,17 @@ setup(void)
                if (!XGetWindowAttributes(dpy, parentwin, &wa))
                        die("could not get embedding window attributes: 0x%lx",
                            parentwin);
-               x = 0;
-               y = topbar ? 0 : wa.height - mh;
-               mw = wa.width;
+
+               if (centered) {
+                       mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
+                       x = (wa.width  - mw) / 2;
+                       y = (wa.height - mh) / 2;
+               } else {
+                       x = 0;
+                       y = topbar ? 0 : wa.height - mh;
+                       mw = wa.width;
+               }
        }
-       promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
        inputw = MIN(inputw, mw/3);
        match();
 
@@ -669,9 +707,10 @@ setup(void)
        swa.override_redirect = True;
        swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
        swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
-       win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
+       win = XCreateWindow(dpy, parentwin, x, y, mw, mh, border_width,
                            CopyFromParent, CopyFromParent, CopyFromParent,
                            CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
++      XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
        XSetClassHint(dpy, win, &ch);
 
 
@@ -699,7 +738,7 @@ setup(void)
 static void
 usage(void)
 {
-       fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+       fputs("usage: dmenu [-bfirv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
              "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
        exit(1);
 }
@@ -754,10 +793,14 @@ main(int argc, char *argv[])
                        topbar = 0;
                else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
                        fast = 1;
+               else if (!strcmp(argv[i], "-c"))   /* centers dmenu on screen */
+                       centered = 1;
                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
-               } else if (i + 1 == argc)
+               } else if (!strcmp(argv[i], "-r")) /* reject input which results in no match */
+                       reject_no_match = 1;
+               else if (i + 1 == argc)
                        usage();
                /* these options take one argument */
                else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */