Move completions to `contrib`

diff --git a/Makefile b/Makefile
index 9c26ec773dce71c2f7e41c31e8dd38200287297c..c7633ff1daf3bb1a6c27ade7b1664b3cdc144cae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,9 +45,9 @@ install:
        cp -p doc/bspwm.1 "$(DESTDIR)$(MANPREFIX)"/man1
        cp -Pp doc/bspc.1 "$(DESTDIR)$(MANPREFIX)"/man1
        mkdir -p "$(DESTDIR)$(BASHCPL)"
-       cp -p bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
+       cp -p contrib/bash_completion "$(DESTDIR)$(BASHCPL)"/bspc
        mkdir -p "$(DESTDIR)$(ZSHCPL)"
-       cp -p zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
+       cp -p contrib/zsh_completion "$(DESTDIR)$(ZSHCPL)"/_bspc
 
 uninstall:
        rm -f "$(DESTDIR)$(BINPREFIX)"/bspwm

diff --git a/bash_completion b/bash_completion
deleted file mode 100644 (file)
index 6a33305..0000000
--- a/bash_completion
+++ /dev/null
@@ -1,29 +0,0 @@
-_bspc() {
-    local commands='window desktop monitor query pointer rule restore control config quit'
-
-    local settings='focused_border_color active_border_color normal_border_color presel_border_color focused_locked_border_color active_locked_border_color normal_locked_border_color urgent_border_color border_width window_gap split_ratio borderless_monocle gapless_monocle focus_follows_pointer pointer_follows_monitor adaptative_raise apply_floating_atom auto_alternate auto_cancel history_aware_focus'
-
-    COMPREPLY=()
-
-    if [[ $COMP_CWORD -ge 1 ]] ; then
-        local current_word="${COMP_WORDS[COMP_CWORD]}"
-        if [[ $COMP_CWORD -eq 1 ]] ; then
-            COMPREPLY=( $(compgen -W "$commands" -- "$current_word") )
-            return 0
-        else
-            local second_word=${COMP_WORDS[1]}
-            case $second_word in
-                config)
-                    if [[ $COMP_CWORD -eq 2 ]] ; then
-                        COMPREPLY=( $(compgen -W "$settings" -- "$current_word") )
-                        return 0
-                    fi
-                    ;;
-            esac
-        fi
-    fi
-}
-
-complete -F _bspc bspc
-
-# vim: set ft=sh:

diff --git a/contrib/bash_completion b/contrib/bash_completion
new file mode 100644 (file)
index 0000000..6a33305
--- /dev/null
+++ b/contrib/bash_completion
@@ -0,0 +1,29 @@
+_bspc() {
+    local commands='window desktop monitor query pointer rule restore control config quit'
+
+    local settings='focused_border_color active_border_color normal_border_color presel_border_color focused_locked_border_color active_locked_border_color normal_locked_border_color urgent_border_color border_width window_gap split_ratio borderless_monocle gapless_monocle focus_follows_pointer pointer_follows_monitor adaptative_raise apply_floating_atom auto_alternate auto_cancel history_aware_focus'
+
+    COMPREPLY=()
+
+    if [[ $COMP_CWORD -ge 1 ]] ; then
+        local current_word="${COMP_WORDS[COMP_CWORD]}"
+        if [[ $COMP_CWORD -eq 1 ]] ; then
+            COMPREPLY=( $(compgen -W "$commands" -- "$current_word") )
+            return 0
+        else
+            local second_word=${COMP_WORDS[1]}
+            case $second_word in
+                config)
+                    if [[ $COMP_CWORD -eq 2 ]] ; then
+                        COMPREPLY=( $(compgen -W "$settings" -- "$current_word") )
+                        return 0
+                    fi
+                    ;;
+            esac
+        fi
+    fi
+}
+
+complete -F _bspc bspc
+
+# vim: set ft=sh:

diff --git a/contrib/zsh_completion b/contrib/zsh_completion
new file mode 100644 (file)
index 0000000..43bcca3
--- /dev/null
+++ b/contrib/zsh_completion
@@ -0,0 +1,23 @@
+#compdef bspc
+
+_bspc() {
+    local -a commands settings
+    commands=('window' 'desktop' 'monitor' 'query' 'pointer' 'rule' 'restore' 'control' 'config' 'quit')
+    settings=('focused_border_color' 'active_border_color' 'normal_border_color' 'presel_border_color' 'focused_locked_border_color' 'active_locked_border_color' 'normal_locked_border_color' 'urgent_border_color' 'border_width' 'window_gap' 'split_ratio' 'borderless_monocle' 'gapless_monocle' 'focus_follows_pointer' 'pointer_follows_monitor' 'adaptative_raise' 'apply_floating_atom' 'auto_alternate' 'auto_cancel' 'history_aware_focus')
+    if (( CURRENT == 2 )) ; then
+        _values 'command' "$commands[@]"
+    elif (( CURRENT == 3 )) ; then
+        case $words[2] in
+            config)
+                _values 'setting' "$settings[@]"
+                ;;
+            *)
+                return 1
+                ;;
+        esac
+    else
+        return 1
+    fi
+}
+
+_bspc "$@"

diff --git a/zsh_completion b/zsh_completion
deleted file mode 100644 (file)
index 43bcca3..0000000
--- a/zsh_completion
+++ /dev/null
@@ -1,23 +0,0 @@
-#compdef bspc
-
-_bspc() {
-    local -a commands settings
-    commands=('window' 'desktop' 'monitor' 'query' 'pointer' 'rule' 'restore' 'control' 'config' 'quit')
-    settings=('focused_border_color' 'active_border_color' 'normal_border_color' 'presel_border_color' 'focused_locked_border_color' 'active_locked_border_color' 'normal_locked_border_color' 'urgent_border_color' 'border_width' 'window_gap' 'split_ratio' 'borderless_monocle' 'gapless_monocle' 'focus_follows_pointer' 'pointer_follows_monitor' 'adaptative_raise' 'apply_floating_atom' 'auto_alternate' 'auto_cancel' 'history_aware_focus')
-    if (( CURRENT == 2 )) ; then
-        _values 'command' "$commands[@]"
-    elif (( CURRENT == 3 )) ; then
-        case $words[2] in
-            config)
-                _values 'setting' "$settings[@]"
-                ;;
-            *)
-                return 1
-                ;;
-        esac
-    else
-        return 1
-    fi
-}
-
-_bspc "$@"