From 9e9284666c9fcf3278ad17f98a247658db8b2269 Mon Sep 17 00:00:00 2001 From: sewn Date: Sun, 10 Mar 2024 18:00:48 +0300 Subject: port dmenu password patch --- menu.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'menu.c') diff --git a/menu.c b/menu.c index f48a8f0..f95409f 100644 --- a/menu.c +++ b/menu.c @@ -89,11 +89,11 @@ static bool parse_color(const char *color, uint32_t *result) { // Parse menu options from command line arguments. void menu_getopts(struct menu *menu, int argc, char *argv[]) { const char *usage = - "Usage: wmenu [-biv] [-f font] [-l lines] [-o output] [-p prompt]\n" + "Usage: wmenu [-biPv] [-f font] [-l lines] [-o output] [-p prompt]\n" "\t[-N color] [-n color] [-M color] [-m color] [-S color] [-s color]\n"; int opt; - while ((opt = getopt(argc, argv, "bhivf:l:o:p:N:n:M:m:S:s:")) != -1) { + while ((opt = getopt(argc, argv, "bhiPvf:l:o:p:N:n:M:m:S:s:")) != -1) { switch (opt) { case 'b': menu->bottom = true; @@ -101,6 +101,9 @@ void menu_getopts(struct menu *menu, int argc, char *argv[]) { case 'i': menu->strncmp = strncasecmp; break; + case 'P': + menu->passwd = true; + break; case 'v': puts("wmenu " VERSION); exit(EXIT_SUCCESS); @@ -335,8 +338,13 @@ static void match_items(struct menu *menu) { // Read menu items from standard input. void read_menu_items(struct menu *menu) { - char buf[sizeof menu->input]; + if (menu->passwd) { + // Don't read standard input in password mode + calc_widths(menu); + return; + } + char buf[sizeof menu->input]; struct item **next = &menu->items; while (fgets(buf, sizeof buf, stdin)) { char *p = strchr(buf, '\n'); -- cgit v1.2.3