commit 3d36829ce7a203f97e84723e1dc02fef1e0d06cc
parent 4e73cdc4c376ad61d2e4858bc87cf01eab0dd403
Author: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 30 Jul 2020 17:41:40 +0200
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:
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/contrib/dmenu/README.md b/contrib/dmenu/README.md
@@ -4,6 +4,10 @@ clipboard without having to open up a terminal window if you don't already have
one open. If `--type` is specified, the password is typed using [xdotool][]
instead of copied to the clipboard.
+On wayland [dmenu-wl][] is used to replace dmenu and [ydotool][] to replace xdotool.
+Note that the latter requires access to the [uinput][] device, so you'll probably
+need to add an extra udev rule or similar to give certain non-root users permission.
+
# Usage
passmenu [--type] [dmenu arguments...]
@@ -11,3 +15,6 @@ instead of copied to the clipboard.
[dmenu]: http://tools.suckless.org/dmenu/
[xdotool]: http://www.semicomplete.com/projects/xdotool/
[pass]: http://www.zx2c4.com/projects/password-store/
+[dmenu-wl]: https://github.com/nyyManni/dmenu-wayland
+[ydotool]: https://github.com/ReimuNotMoe/ydotool
+[uinput]: https://www.kernel.org/doc/html/v4.12/input/uinput.html
diff --git 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
