aboutsummaryrefslogtreecommitdiffstats
path: root/completions
diff options
context:
space:
mode:
authorLibravatar Peter Grayson <pete@jpgrayson.net>2019-03-08 12:43:04 -0500
committerLibravatar Brian Ashworth <bosrsf04@gmail.com>2019-03-08 14:29:39 -0500
commitb7fe5097e949b9bfde6fd52f26d2599068833563 (patch)
tree37459687d2f8a639bc0439c98fdb00bf87d61ad8 /completions
parentipc: describe libinput device configuration (diff)
downloadsway-b7fe5097e949b9bfde6fd52f26d2599068833563.tar.gz
sway-b7fe5097e949b9bfde6fd52f26d2599068833563.tar.zst
sway-b7fe5097e949b9bfde6fd52f26d2599068833563.zip
Add -p/--pretty option to swaymsg
This new option forces pretty (non-raw/non-JSON) output. By default, when not using a tty, swaymsg outputs using the "raw" format. This makes it impossible to, for example, pipe the pretty output to a pager such as `less` since piping does not use a tty. The new -p/--pretty option gives the user explicit control over the output format while retaining the default tty-dependent behavior. Signed-off-by: Peter Grayson <pete@jpgrayson.net>
Diffstat (limited to 'completions')
-rw-r--r--completions/bash/swaymsg2
-rw-r--r--completions/fish/swaymsg.fish3
-rw-r--r--completions/zsh/_swaymsg7
3 files changed, 8 insertions, 4 deletions
diff --git a/completions/bash/swaymsg b/completions/bash/swaymsg
index 20092bdc..0b011902 100644
--- a/completions/bash/swaymsg
+++ b/completions/bash/swaymsg
@@ -21,6 +21,7 @@ _swaymsg()
21 21
22 short=( 22 short=(
23 -h 23 -h
24 -p
24 -q 25 -q
25 -r 26 -r
26 -s 27 -s
@@ -30,6 +31,7 @@ _swaymsg()
30 31
31 long=( 32 long=(
32 --help 33 --help
34 --pretty
33 --quiet 35 --quiet
34 --raw 36 --raw
35 --socket 37 --socket
diff --git a/completions/fish/swaymsg.fish b/completions/fish/swaymsg.fish
index 636e3500..3f1cc50c 100644
--- a/completions/fish/swaymsg.fish
+++ b/completions/fish/swaymsg.fish
@@ -2,10 +2,11 @@
2 2
3complete -f -c swaymsg 3complete -f -c swaymsg
4complete -c swaymsg -s h -l help --description "Show help message and quit." 4complete -c swaymsg -s h -l help --description "Show help message and quit."
5complete -c swaymsg -s p -l pretty --description "Use pretty output even when not using a tty."
5complete -c swaymsg -s q -l quiet --description "Sends the IPC message but does not print the response from sway." 6complete -c swaymsg -s q -l quiet --description "Sends the IPC message but does not print the response from sway."
6complete -c swaymsg -s v -l version --description "Print the version (of swaymsg) and quit."
7complete -c swaymsg -s r -l raw --description "Use raw output even if using tty." 7complete -c swaymsg -s r -l raw --description "Use raw output even if using tty."
8complete -c swaymsg -s s -l socket -r --description "Use the specified socket path. Otherwise, swaymsg will ask where the socket is (which is the value of $SWAYSOCK, then of $I3SOCK)." 8complete -c swaymsg -s s -l socket -r --description "Use the specified socket path. Otherwise, swaymsg will ask where the socket is (which is the value of $SWAYSOCK, then of $I3SOCK)."
9complete -c swaymsg -s v -l version --description "Print the version (of swaymsg) and quit."
9 10
10complete -c swaymsg -s t -l type -fr --description "Specify the type of IPC message." 11complete -c swaymsg -s t -l type -fr --description "Specify the type of IPC message."
11complete -c swaymsg -s t -l type -fra 'get_workspaces' --description "Gets a JSON-encoded list of workspaces and their status." 12complete -c swaymsg -s t -l type -fra 'get_workspaces' --description "Gets a JSON-encoded list of workspaces and their status."
diff --git a/completions/zsh/_swaymsg b/completions/zsh/_swaymsg
index 0ba45d4a..c11fa990 100644
--- a/completions/zsh/_swaymsg
+++ b/completions/zsh/_swaymsg
@@ -28,10 +28,11 @@ types=(
28) 28)
29 29
30_arguments -s \ 30_arguments -s \
31 '(-v --version)'{-v,--version}'[Show the version number and quit]' \
32 '(-m --monitor)'{-m,--monitor}'[Monitor until killed (-t SUBSCRIBE only)]' \
33 '(-h --help)'{-h,--help}'[Show help message and quit]' \ 31 '(-h --help)'{-h,--help}'[Show help message and quit]' \
32 '(-m --monitor)'{-m,--monitor}'[Monitor until killed (-t SUBSCRIBE only)]' \
33 '(-p --pretty)'{-p,--pretty}'[Use pretty output even when not using a tty]' \
34 '(-q --quiet)'{-q,--quiet}'[Be quiet]' \ 34 '(-q --quiet)'{-q,--quiet}'[Be quiet]' \
35 '(-r --raw)'{-r,--raw}'[Use raw output even if using a tty]' \ 35 '(-r --raw)'{-r,--raw}'[Use raw output even if using a tty]' \
36 '(-s --socket)'{-s,--socket}'[Use the specified socket path]:files:_files' \ 36 '(-s --socket)'{-s,--socket}'[Use the specified socket path]:files:_files' \
37 '(-t --type)'{-t,--type}'[Specify the message type]:type:{_describe "type" types}' 37 '(-t --type)'{-t,--type}'[Specify the message type]:type:{_describe "type" types}' \
38 '(-v --version)'{-v,--version}'[Show the version number and quit]'