port dmenu password patch

4 files changed, 37 insertions, 6 deletions

diff --git a/docs/wmenu.1.scd b/docs/wmenu.1.scd
index 0117aa1..407da9f 100644
--- a/docs/wmenu.1.scd
+++ b/docs/wmenu.1.scd
@@ -6,7 +6,7 @@ wmenu - dynamic menu for Wayland
 
 # SYNOPSIS
 
-*wmenu* [-biv] \
+*wmenu* [-biPv] \
   [-f _font_] \
   [-l _lines_] \
   [-o _output_] \
@@ -30,6 +30,10 @@ to those matching the tokens in the input.
 *-i*
 	wmenu matches menu items case insensitively.
 
+*-P*
+	wmenu will not directly display the keyboard input, but instead replace it
+	with asterisks. All data from stdin will be ignored.
+
 *-v*
 	prints version information to stdout, then exits.
 
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');
diff --git a/menu.h b/menu.h
index 4c62d3f..c9460d6 100644
--- a/menu.h
+++ b/menu.h
@@ -53,6 +53,8 @@ struct menu {
 	bool bottom;
 	// The function used to match menu items
 	int (*strncmp)(const char *, const char *, size_t);
+	// Whether the input is a password
+	bool passwd;
 	// The font used to display the menu
 	char *font;
 	// The number of lines to list items vertically
diff --git a/render.c b/render.c
index 135d51f..a0a2a8c 100644
--- a/render.c
+++ b/render.c
@@ -1,4 +1,7 @@
+#define _POSIX_C_SOURCE 200809L
 #include <cairo/cairo.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "render.h"
 
@@ -72,8 +75,22 @@ static void render_prompt(struct menu *menu, cairo_t *cairo) {
 
 // Renders the input text.
 static void render_input(struct menu *menu, cairo_t *cairo) {
-	render_text(menu, cairo, menu->input, menu->promptw, 0, 0,
-		0, menu->normalfg, menu->padding, menu->padding);
+	char *censort = NULL;
+
+	if (menu->passwd) {
+		censort = calloc(1, sizeof(menu->input));
+		if (!censort) {
+			return;
+		}
+		memset(censort, '*', strlen(menu->input));
+	}
+
+	render_text(menu, cairo, menu->passwd ? censort : menu->input,
+		menu->promptw, 0, 0, 0, menu->normalfg, menu->padding, menu->padding);
+
+	if (censort) {
+		free(censort);
+	}
 }
 
 // Renders a cursor for the input field.