Switch to a light theme

diff --git a/config.h b/config.h
index cf0fe3b20c87bb6f903d08f367383dbfb783ecd0..b4d27d98c99928af9615b566e485149f0f1bedf6 100644 (file)
--- a/config.h
+++ b/config.h
@@ -9,12 +9,12 @@ static const char *fonts[] = {
 };
 static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
 static const char *colors[SchemeLast][2] = {
-       /*     fg         bg       */
-       [SchemeNorm] = { "#bbbbbb", "#222222" },
-       [SchemeSel] = { "#eeeeee", "#005577" },
-       [SchemeSelHighlight] = { "#ffc978", "#005577" },
-       [SchemeNormHighlight] = { "#ffc978", "#222222" },
-       [SchemeOut] = { "#000000", "#00ffff" },
+       //                        fg         bg
+       [SchemeNorm] =          { "#000000", "#ffffff" },
+       [SchemeSel] =           { "#ffffff", "#000000" },
+       [SchemeSelHighlight] =  { "#ffc978", "#000000" },
+       [SchemeNormHighlight] = { "#000000", "#ffffff" },
+       [SchemeOut] =           { "#000000", "#00ffff" },
 };
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
 static unsigned int lines      = 0;

diff --git a/dmenu.1 b/dmenu.1
index 472b179a5abd9746ee7c0bcf6862e206ddc57ebb..90aa7b59b1586207fe4a2f0e2d7cd49d6e1a6afc 100644 (file)
--- a/dmenu.1
+++ b/dmenu.1
@@ -3,7 +3,7 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
-.RB [ \-bfiv ]
+.RB [ \-bfivP ]
 .RB [ \-l
 .IR lines ]
 .RB [ \-m
@@ -55,6 +55,9 @@ is faster, but will lock up X until stdin reaches end\-of\-file.
 .B \-i
 dmenu matches menu items case insensitively.
 .TP
+.B \-P
+dmenu will not directly display the keyboard input, but instead replace it with dots. All data from stdin will be ignored.
+.TP
 .BI \-l " lines"
 dmenu lists items vertically, with the given number of lines.
 .TP

diff --git a/dmenu.c b/dmenu.c
index b76fba4d99526d72e3c201209eaac59e09fb2e6b..e22e054d4a4b8b04bdb6674dcf4ac1666c46dd74 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -44,7 +44,7 @@ static char numbers[NUMBERSBUFSIZE] = "";
 static char text[BUFSIZ] = "";
 static char *embed;
 static int bh, mw, mh;
-static int inputw = 0, promptw;
+static int inputw = 0, promptw, passwd = 0;
 static int lrpad; /* sum of left and right padding */
 static size_t cursor;
 static struct item *items = NULL;
@@ -196,6 +196,7 @@ drawmenu(void)
        unsigned int curpos;
        struct item *item;
        int x = 0, y = 0, w;
+       char *censort;
 
        drw_setscheme(drw, scheme[SchemeNorm]);
        drw_rect(drw, 0, 0, mw, mh, 1, 1);
@@ -207,7 +208,12 @@ drawmenu(void)
        /* draw input field */
        w = (lines > 0 || !matches) ? mw - x : inputw;
        drw_setscheme(drw, scheme[SchemeNorm]);
-       drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
+       if (passwd) {
+               censort = ecalloc(1, sizeof(text));
+               memset(censort, '*', strlen(text));
+               drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0);
+               free(censort);
+       } else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
 
        curpos = TEXTW(text) - TEXTW(&text[cursor]);
        if ((curpos += lrpad / 2 - 1) < w) {
@@ -676,6 +682,11 @@ readstdin(void)
        char buf[sizeof text], *p;
        size_t i, imax = 0, size = 0;
        unsigned int tmpmax = 0;
+       if(passwd){
+       inputw = lines = 0;
+       return;
+       }
+
 
        /* read each line from stdin and add it to the item list */
        for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
@@ -841,7 +852,7 @@ setup(void)
 static void
 usage(void)
 {
-       fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+       fputs("usage: dmenu [-bfivP] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
              "             [-nb color] [-nf color] [-sb color] [-sf color]\n"
              "             [-nhb color] [-nhf color] [-shb color] [-shf color] [-w windowid]\n", stderr);
        exit(1);
@@ -867,7 +878,9 @@ main(int argc, char *argv[])
                else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
                        fstrncmp = strncasecmp;
                        fstrstr = cistrstr;
-               } else if (i + 1 == argc)
+               } else if (!strcmp(argv[i], "-P"))   /* is the input a password */
+                       passwd = 1;
+               else if (i + 1 == argc)
                        usage();
                /* these options take one argument */
                else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */