From c0ae94b2438b97a30af43b3d603da6637c195858 Mon Sep 17 00:00:00 2001 From: Alexander Bocken Date: Mon, 3 Jan 2022 14:41:00 +0100 Subject: [PATCH] applied password patch --- dmenu.1 | 5 ++++- dmenu.c | 20 +++++++++++++++++--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dmenu.1 b/dmenu.1 index 461cc20..a1fa51b 100644 --- a/dmenu.1 +++ b/dmenu.1 @@ -3,7 +3,7 @@ dmenu \- dynamic menu .SH SYNOPSIS .B dmenu -.RB [ \-bfinv ] +.RB [ \-bfinvP ] .RB [ \-l .IR lines ] .RB [ \-m @@ -52,6 +52,9 @@ dmenu matches menu items case insensitively. .B \-n dmenu instantly selects if only one match. .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 4e5c109..02630e9 100644 --- a/dmenu.c +++ b/dmenu.c @@ -38,7 +38,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; @@ -146,6 +146,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); @@ -157,7 +158,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) { @@ -567,6 +573,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++) { @@ -732,7 +743,7 @@ setup(void) static void usage(void) { - fputs("usage: dmenu [-bfinv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + fputs("usage: dmenu [-bfinvP] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid] [-it text]\n", stderr); exit(1); } @@ -757,6 +768,8 @@ main(int argc, char *argv[]) fstrstr = cistrstr; } else if (!strcmp(argv[i], "-n")) /* instant select only match */ instant = 1; + else if (!strcmp(argv[i], "-P")) /* is the input a password */ + passwd = 1; else if (i + 1 == argc) usage(); /* these options take one argument */ @@ -817,3 +830,4 @@ main(int argc, char *argv[]) return 1; /* unreachable */ } +