From b2a26fccb727e36625b2feeb53af66fa29a72577 Mon Sep 17 00:00:00 2001 From: ProsperousPotato Date: Fri, 25 Jul 2025 22:55:23 +0100 Subject: updates --- dmenu | Bin 42776 -> 42808 bytes dmenu.1 | 5 ++++- dmenu.c | 21 +++++++++++++++++---- dmenu.o | Bin 31992 -> 32592 bytes include_dmenu | 6 +++--- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/dmenu b/dmenu index 5b2f92a..03ad8fa 100755 Binary files a/dmenu and b/dmenu differ 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 40f93e0..4b25cb6 100644 --- a/dmenu.c +++ b/dmenu.c @@ -36,7 +36,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; @@ -148,6 +148,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); @@ -159,7 +160,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) { @@ -552,6 +558,11 @@ readstdin(void) size_t i, itemsiz = 0, linesiz = 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, &linesiz, stdin)) != -1; i++) { if (i + 1 >= itemsiz) { @@ -715,7 +726,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]"); } @@ -737,7 +748,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/dmenu.o b/dmenu.o index d2d4728..a2346ae 100644 Binary files a/dmenu.o and b/dmenu.o differ diff --git a/include_dmenu b/include_dmenu index 35910e0..f9bb3cb 100644 --- a/include_dmenu +++ b/include_dmenu @@ -1,9 +1,9 @@ +chromium +connmap goverlay heroic -icecat -monero-wallet-gui nvidia-settings -qbittorrent +openbased st steam xtest -- cgit v1.2.3