From f285349a2f587b89661844e236b899b93f850b05 Mon Sep 17 00:00:00 2001 From: Sebastian LaVine Date: Thu, 19 Jan 2023 01:01:21 -0500 Subject: [PATCH] Apply dmenu-password-5.0.diff https://tools.suckless.org/dmenu/patches/password/ --- dmenu.1 | 5 ++++- dmenu.c | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dmenu.1 b/dmenu.1 index 525e41d..b474a75 100644 --- a/dmenu.1 +++ b/dmenu.1 @@ -3,7 +3,7 @@ dmenu \- dynamic menu .SH SYNOPSIS .B dmenu -.RB [ \-bfinv ] +.RB [ \-bfinvP ] .RB [ \-bw .IR width ] .RB [ \-g @@ -69,6 +69,9 @@ dmenu instantly selects if only one match. .BI \-g " columns" dmenu lists items in a grid with the given number of columns. .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 in a grid with the given number of lines. .TP diff --git a/dmenu.c b/dmenu.c index 114e9ac..e6b23e3 100644 --- a/dmenu.c +++ b/dmenu.c @@ -43,7 +43,7 @@ static int bh, mw, mh; static int dmx = 0; /* put dmenu at this x offset */ static int dmy = 0; /* put dmenu at this y offset (measured from the bottom if topbar is 0) */ static unsigned int dmw = 0; /* make dmenu this wide */ -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; @@ -218,6 +218,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); @@ -229,7 +230,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) { @@ -791,6 +797,11 @@ readstdin(void) size_t i, junk, itemsiz = 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++) { if (i + 1 >= itemsiz) { @@ -976,7 +987,7 @@ setup(void) static void usage(void) { - die("usage: dmenu [-bfinv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" + die("usage: dmenu [-bfinvP] [-l lines] [-p prompt] [-fn font] [-m monitor]\n" " [-bw width] [-x xoffset] [-y yoffset] [-z width]\n" " [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]"); } @@ -1003,6 +1014,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 */ -- 2.45.2