diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2020-07-30 17:41:40 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2021-06-11 18:29:09 +0200 |
| commit | 3d36829ce7a203f97e84723e1dc02fef1e0d06cc (patch) | |
| tree | 46713ccc54d7616a9010f4fd25a2e85f85943d35 /contrib/dmenu/passmenu | |
| parent | 4e73cdc4c376ad61d2e4858bc87cf01eab0dd403 (diff) | |
passmenu: add support for wayland
Use a similar detection mechanism to pass itself.
On wayland use:
* dmenu-wl instead of dmenu, an (almost) drop-in replacement
* ydotool instead of xdotool, a uinput-based replacement for
xdotool. It is not as feature-complete, but probably the
simplest (or only?) way to add the --type functionality to
passmenu on wayland.
Diffstat (limited to 'contrib/dmenu/passmenu')
| -rwxr-xr-x | contrib/dmenu/passmenu | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/contrib/dmenu/passmenu b/contrib/dmenu/passmenu index 83268bc..76d92ab 100755 --- a/contrib/dmenu/passmenu +++ b/contrib/dmenu/passmenu @@ -8,18 +8,28 @@ if [[ $1 == "--type" ]]; then shift fi +if [[ -n $WAYLAND_DISPLAY ]]; then + dmenu=dmenu-wl + xdotool="ydotool type --file -" +elif [[ -n $DISPLAY ]]; then + dmenu=dmenu + xdotool="xdotool type --clearmodifiers --file -" +else + echo "Error: No Wayland or X11 display detected" >&2 + exit 1 +fi + prefix=${PASSWORD_STORE_DIR-~/.password-store} password_files=( "$prefix"/**/*.gpg ) password_files=( "${password_files[@]#"$prefix"/}" ) password_files=( "${password_files[@]%.gpg}" ) -password=$(printf '%s\n' "${password_files[@]}" | dmenu "$@") +password=$(printf '%s\n' "${password_files[@]}" | "$dmenu" "$@") [[ -n $password ]] || exit if [[ $typeit -eq 0 ]]; then pass show -c "$password" 2>/dev/null else - pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | - xdotool type --clearmodifiers --file - + pass show "$password" | { IFS= read -r pass; printf %s "$pass"; } | $xdotool fi |