rowan/wmenu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

port dmenu password patch

Browse source
This commit is contained in:
sewn 2024-03-10 18:00:48 +03:00 • committed by adnano
parent 6ad7a303ef
commit 9e9284666c
4 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/wmenu.1.scd
View file

@ -6,7 +6,7 @@ wmenu - dynamic menu for Wayland
# SYNOPSIS # SYNOPSIS
*wmenu* [-biv] \ *wmenu* [-biPv] \
[-f _font_] \ [-f _font_] \
[-l _lines_] \ [-l _lines_] \
[-o _output_] \ [-o _output_] \
@ -30,6 +30,10 @@ to those matching the tokens in the input.
*-i* *-i*
wmenu matches menu items case insensitively. 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* *-v*
prints version information to stdout, then exits. prints version information to stdout, then exits.

14
menu.c
View file

@ -89,11 +89,11 @@ static bool parse_color(const char *color, uint32_t *result) {
// Parse menu options from command line arguments. // Parse menu options from command line arguments.
void menu_getopts(struct menu *menu, int argc, char *argv[]) { void menu_getopts(struct menu *menu, int argc, char *argv[]) {
const char *usage = 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"; "\t[-N color] [-n color] [-M color] [-m color] [-S color] [-s color]\n";
int opt; 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) { switch (opt) {
case 'b': case 'b':
menu->bottom = true; menu->bottom = true;
@ -101,6 +101,9 @@ void menu_getopts(struct menu *menu, int argc, char *argv[]) {
case 'i': case 'i':
menu->strncmp = strncasecmp; menu->strncmp = strncasecmp;
break; break;
case 'P':
menu->passwd = true;
break;
case 'v': case 'v':
puts("wmenu " VERSION); puts("wmenu " VERSION);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
@ -335,8 +338,13 @@ static void match_items(struct menu *menu) {
// Read menu items from standard input. // Read menu items from standard input.
void read_menu_items(struct menu *menu) { 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; struct item **next = &menu->items;
while (fgets(buf, sizeof buf, stdin)) { while (fgets(buf, sizeof buf, stdin)) {
char *p = strchr(buf, '\n'); char *p = strchr(buf, '\n');

2
menu.h
View file

@ -53,6 +53,8 @@ struct menu {
bool bottom; bool bottom;
// The function used to match menu items // The function used to match menu items
int (*strncmp)(const char *, const char *, size_t); int (*strncmp)(const char *, const char *, size_t);
// Whether the input is a password
bool passwd;
// The font used to display the menu // The font used to display the menu
char *font; char *font;
// The number of lines to list items vertically // The number of lines to list items vertically

21
render.c
View file

@ -1,4 +1,7 @@
#define _POSIX_C_SOURCE 200809L
#include <cairo/cairo.h> #include <cairo/cairo.h>
#include <stdlib.h>
#include <string.h>
#include "render.h" #include "render.h"
@ -72,8 +75,22 @@ static void render_prompt(struct menu *menu, cairo_t *cairo) {
// Renders the input text. // Renders the input text.
static void render_input(struct menu *menu, cairo_t *cairo) { static void render_input(struct menu *menu, cairo_t *cairo) {
render_text(menu, cairo, menu->input, menu->promptw, 0, 0, char *censort = NULL;
0, menu->normalfg, menu->padding, menu->padding);
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. // Renders a cursor for the input field.