Makefile

@@ -34,7 +34,7 @@ clean:
 dist: clean
 	mkdir -p dmenu-$(VERSION)
 	cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
-		drw.h util.h dmenu_path dmenu_run passmenu2 stest.1 $(SRC)\
+		drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
 		dmenu-$(VERSION)
 	tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
 	gzip dmenu-$(VERSION).tar
@@ -42,11 +42,10 @@ dist: clean
 
 install: all
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f dmenu dmenu_path dmenu_run passmenu2 stest $(DESTDIR)$(PREFIX)/bin
+	cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/passmenu2
 	chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
 	sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
@@ -58,7 +57,6 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
 		$(DESTDIR)$(PREFIX)/bin/dmenu_path\
 		$(DESTDIR)$(PREFIX)/bin/dmenu_run\
-		$(DESTDIR)$(PREFIX)/bin/passmenu2\
 		$(DESTDIR)$(PREFIX)/bin/stest\
 		$(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
 		$(DESTDIR)$(MANPREFIX)/man1/stest.1

dmenu.1

@@ -3,7 +3,7 @@
 dmenu \- dynamic menu
 .SH SYNOPSIS
 .B dmenu
-.RB [ \-bfiPv ]
+.RB [ \-bfiv ]
 .RB [ \-l
 .IR lines ]
 .RB [ \-m
@@ -50,9 +50,6 @@ dmenu matches menu items case insensitively.
 .BI \-l " lines"
 dmenu lists items vertically, with the given number of lines.
 .TP
-.B \-P
-dmenu will not directly display the keyboard input, but instead replace it with dots.
-All data from stdin will be ignored.
 .BI \-m " monitor"
 dmenu is displayed on the monitor number supplied. Monitor numbers are starting
 from 0.

dmenu.c

@@ -37,7 +37,7 @@ struct item {
 static char text[BUFSIZ] = "";
 static char *embed;
 static int bh, mw, mh;
-static int inputw = 0, promptw, passwd = 0;
+static int inputw = 0, promptw;
 static int lrpad; /* sum of left and right padding */
 static size_t cursor;
 static struct item *items = NULL;
@@ -132,7 +132,6 @@ 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);
@@ -144,12 +143,7 @@ drawmenu(void)
 	/* draw input field */
 	w = (lines > 0 || !matches) ? mw - x : inputw;
 	drw_setscheme(drw, scheme[SchemeNorm]);
-	if(passwd) {
+	drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
-		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) {
@@ -531,11 +525,6 @@ readstdin(void)
 	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++) {
 		if (i + 1 >= size / sizeof *items)
@@ -700,7 +689,7 @@ setup(void)
 static void
 usage(void)
 {
-	fputs("usage: dmenu [-bfiPv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+	fputs("usage: dmenu [-bfiv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
 	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
 	exit(1);
 }
@@ -723,9 +712,7 @@ main(int argc, char *argv[])
 		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
 			fstrncmp = strncasecmp;
 			fstrstr = cistrstr;
-		} else if (!strcmp(argv[i], "-P")) /* is the input a password */
+		} else if (i + 1 == argc)
-			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 */

passmenu2

@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-shopt -s nullglob globstar
-
-typeit=0
-if [[ $1 == "--type" ]]; then
-	typeit=1
-	shift
-fi
-
-
-STARTDIR=${PASSWORD_STORE_DIR-~/.password-store}
-BASEDIR=$STARTDIR
-DONE=0
-LEVEL=0
-PREVSELECTION=""
-SELECTION=""
-
-while [ "$DONE" -eq 0 ] ; do
-	password_files=( "$STARTDIR"/* )
-	password_files=( "${password_files[@]#"$STARTDIR"/}" )
-	password_files=( "${password_files[@]%.gpg}" )
-
-	if [ "$LEVEL" -ne 0 ] ; then
-		password_files=(".." "${password_files[@]}")
-	fi
-	entry=$(printf '%s\n' "${password_files[@]}" | dmenu "$@" -l 15)
-
-	echo "entry: $entry"
-	if [ -z "$entry" ] ; then
-		DONE=1
-		exit
-	fi
-
-	if [ "$entry" != ".." ] ; then
-		PREVSELECTION=$SELECTION
-		SELECTION="$SELECTION/$entry"
-
-		# check if another dir
-		if [ -d "$STARTDIR/$entry" ] ; then
-			STARTDIR="$STARTDIR/$entry"
-			LEVEL=$((LEVEL+1))
-		else
-			# not a directory so it must be a real password entry
-			if [[ $typeit -eq 0 ]]; then
-				pass show -c "$SELECTION" 2>/dev/null
-			else
-				xdotool - <<<"type --clearmodifiers -- $(pass show "$SELECTION" | head -n 1)"
-			fi
-			DONE=1
-		fi
-
-	else
-		LEVEL=$((LEVEL-1))
-		SELECTION=$PREVSELECTION
-		STARTDIR="$BASEDIR/$SELECTION"
-	fi
-done
-