Merge branch 'swaywm:master' into master

This commit is contained in:
tmpm697 2021-07-16 19:58:04 +07:00 committed by GitHub
commit b320abd92d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -113,7 +113,7 @@ elif [ "$SUBJECT" = "area" ] ; then
GEOM=$(slurp -d)
# Check if user exited slurp without selecting the area
if [ -z "$GEOM" ]; then
exit
exit 1
fi
WHAT="Area"
elif [ "$SUBJECT" = "active" ] ; then
@ -132,7 +132,7 @@ elif [ "$SUBJECT" = "window" ] ; then
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
exit 1
fi
WHAT="Window"
else