mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-13 05:54:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add check for empty GEOM variable

Browse Source 
In case when slurp is used to select part of screen or a window, if user aborts
the selection, grimshot will capture the whole screen instead of exiting. This
is fixed with check for empty variable.
This commit is contained in:
Vinko Kašljević 2020-07-15 18:31:09 +02:00 committed by Simon Ser
parent acbe902815
commit c65cd1cffa
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/grimshot
View File

@ -111,6 +111,10 @@ if [ "$ACTION" = "check" ] ; then
exit exit
elif [ "$SUBJECT" = "area" ] ; then elif [ "$SUBJECT" = "area" ] ; then
GEOM=$(slurp -d) GEOM=$(slurp -d)
# Check if user exited slurp without selecting the area
if [ -z "$GEOM" ]; then
exit
fi
WHAT="Area" WHAT="Area"
elif [ "$SUBJECT" = "active" ] ; then elif [ "$SUBJECT" = "active" ] ; then
FOCUSED=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]?, .floating_nodes[]?) | select(.focused)') FOCUSED=$(swaymsg -t get_tree | jq -r 'recurse(.nodes[]?, .floating_nodes[]?) | select(.focused)')
@ -126,6 +130,10 @@ elif [ "$SUBJECT" = "output" ] ; then
WHAT="$OUTPUT" WHAT="$OUTPUT"
elif [ "$SUBJECT" = "window" ] ; then elif [ "$SUBJECT" = "window" ] ; then
GEOM=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"' | slurp) GEOM=$(swaymsg -t get_tree | jq -r '.. | select(.pid? and .visible?) | .rect | "\(.x),\(.y) \(.width)x\(.height)"' | slurp)
# Check if user exited slurp without selecting the area
if [ -z "$GEOM" ]; then
exit
fi
WHAT="Window" WHAT="Window"
else else
die "Unknown subject to take a screen shot from" "$SUBJECT" die "Unknown subject to take a screen shot from" "$SUBJECT"