Merge branch 'master' into wlr-gamma-control

3 files changed, 4 insertions, 24 deletions

diff --git a/completions/zsh/_sway b/completions/zsh/_sway
index bab90fbf..05112002 100644
--- a/completions/zsh/_sway
+++ b/completions/zsh/_sway
@@ -18,5 +18,5 @@ _arguments -s \
         '(-c --config)'{-c,--config}'[Specify a config file]:files:_files' \
         '(-C --validate)'{-C,--validate}'[Check validity of the config file, then exit]' \
         '(-d --debug)'{-d,--debug}'[Enables full logging, including debug information]' \
-        '(-v --verbose)'{-v,--verbose}'[Enables more verbose logging]' \
+        '(-V --verbose)'{-V,--verbose}'[Enables more verbose logging]' \
         '(--get-socketpath)'--get-socketpath'[Gets the IPC socket path and prints it, then exits]'
diff --git a/completions/zsh/_swaygrab b/completions/zsh/_swaygrab
deleted file mode 100644
index 0f9846f4..00000000
--- a/completions/zsh/_swaygrab
+++ /dev/null
@@ -1,23 +0,0 @@
-#compdef swaygrab
-#-----------------
-# Description
-# -----------
-#
-# Completion script for swaygrab in sway wm (http://swaywm.org)
-#
-# -----------------------------------------------------
-# Author
-# ------
-#
-# * Seth Barberee <seth.barberee@gmail.com>
-#
-# ------------------------------------------
-
-_arguments -s \
-        '(-h --help)'{-h,--help}'[Shows help message]' \
-        '(-c --capture)'{-c,--capture}'[Captures multiple frames as video and passes them to ffmpeg]' \
-        '(-o --output)'{-o,--output}'[Use the specified output. If not specified then current focused output will be used]' \
-        '(-v --version)'{-v,--version}'[Print the version (of swaymsg) and quit]' \
-        '(-s --socket)'{-s,--socket}'[Use the specified socket path.]:files:_files' \
-        '(-r --rate)'{-r,--rate}'[Specify a framerate (in fps). Used in combination with -c. Default is 30 and must be an integer]' \
-        '(--raw)--raw[Instead of ImageMagick or ffmpeg, dump raw rgba data to stdout]'
diff --git a/completions/zsh/_swaymsg b/completions/zsh/_swaymsg
index 2e39deb6..a7a1c8e0 100644
--- a/completions/zsh/_swaymsg
+++ b/completions/zsh/_swaymsg
@@ -22,6 +22,9 @@ types=(
 'get_marks'
 'get_bar_config'
 'get_version'
+'get_binding_modes'
+'get_config'
+'send_tick'
 )
 
 _arguments -s \