Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tv pinentry-urxvt: kill only screenshot displayers

Browse Source
This commit is contained in:
tv 2022-12-09 21:53:09 +01:00
parent 9051f57095
commit fe01fe6bf4
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tv/5pkgs/simple/pinentry-urxvt/default.nix
View File

@ -52,25 +52,26 @@ in
trap cleanup EXIT trap cleanup EXIT
cleanup() { cleanup() {
${pkgs.utillinux}/bin/kill -- $(${pkgs.coreutils}/bin/cat "$displayers")
rm "$displayers"
rm "$screenshot" rm "$screenshot"
# Kill process group in order to kill screenshot windows.
${pkgs.utillinux}/bin/kill 0
} }
screenshot=$(${pkgs.coreutils}/bin/mktemp -t pinentry-urxvt.screenshot.XXXXXXXX) displayers=$(${pkgs.coreutils}/bin/mktemp -t pinentry-urxvt.$$.displayers.XXXXXXXX)
screenshot=$(${pkgs.coreutils}/bin/mktemp -t pinentry-urxvt.$$.screenshot.XXXXXXXX)
${pkgs.xorg.xwd}/bin/xwd -root | ${pkgs.xorg.xwd}/bin/xwd -root |
${pkgs.imagemagick}/bin/convert xwd:- -fill \#424242 -colorize 80% xwd:"$screenshot" ${pkgs.imagemagick}/bin/convert xwd:- -fill \#424242 -colorize 80% xwd:"$screenshot"
show_screenshot() { display_screenshot() {
${pkgs.exec "pinentry-urxvt.show_screenshot" { ${pkgs.exec "pinentry-urxvt.display_screenshot" {
filename = "${pkgs.xorg.xwud}/bin/xwud"; filename = "${pkgs.xorg.xwud}/bin/xwud";
argv = [ argv = [
cfg.xwud.className cfg.xwud.className
"-noclick" "-noclick"
]; ];
}} < "$screenshot" & }} < "$screenshot" &
wait_for_screenshot $! wait_for_screenshot $! && echo $! >>"$displayers"
} }
# Wait for the xwud window by trying to intercept the call to munmap(). # Wait for the xwud window by trying to intercept the call to munmap().
@ -92,12 +93,12 @@ in
fi fi
} }
show_screenshot display_screenshot
${lib.optionalString (cfg.display != null) /* sh */ '' ${lib.optionalString (cfg.display != null) /* sh */ ''
if test "$DISPLAY" != ${lib.shell.escape cfg.display}; then if test "$DISPLAY" != ${lib.shell.escape cfg.display}; then
export DISPLAY=${lib.shell.escape cfg.display} export DISPLAY=${lib.shell.escape cfg.display}
show_screenshot display_screenshot
fi fi
''} ''}