Apply password patch

4 files changed, 21 insertions, 5 deletions

diff --git a/dmenu b/dmenu
new file mode 100755
index 0000000..4a32929
--- /dev/null
+++ b/dmenu
diff --git a/dmenu.1 b/dmenu.1
index 323f93c..762f707 100644
--- 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
@@ -47,6 +47,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 635f204..b1f1d3d 100644
--- a/dmenu.c
+++ b/dmenu.c
@@ -41,7 +41,7 @@ struct item {
 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;
@@ -198,6 +198,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);
@@ -209,7 +210,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) {
@@ -687,6 +693,11 @@ readstdin(void)
         size_t i, junk, size = 0;
         ssize_t len;
 
+        if(passwd){
+        inputw = lines = 0;
+        return;
+        }
+
         /* read each line from stdin and add it to the item list */
         for (i = 0; (len = getline(&line, &junk, stdin)) != -1; i++, line = NULL) {
                 if (i + 1 >= size / sizeof *items)
@@ -847,7 +858,7 @@ setup(void)
 static void
 usage(void)
 {
-        die("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+        die("usage: dmenu [-bfivP] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
             "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]");
 }
 
@@ -871,7 +882,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 */
diff --git a/stest b/stest
new file mode 100755
index 0000000..d2d6ca3
--- /dev/null
+++ b/stest