Add xmodmap and xrdb completions.

CHANGES

@@ -8,7 +8,7 @@ bash-completion (2.x)
 
   [ Ville Skyttä ]
   * Activate hping2 completion also for hping and hping3.
-  * Add crontab, iftop, lrzip, and POSIX sh completions.
+  * Add crontab, iftop, lrzip, POSIX sh, xmodmap, and xrdb completions.
   * Add *.gif (Alioth: #312512), *.3gpp, *.3gpp2, and *.awb to mplayer
     filename completions.
   * Add "short" tarball extensions to unxz, unlzma etc completions.

completions/Makefile.am

@@ -162,7 +162,9 @@ bashcomp_DATA = abook \
 		xmllint \
 		xmlwf \
 		xmms \
+		xmodmap \
 		xrandr \
+		xrdb \
 		xsltproc \
 		xz \
 		yp-tools \

completions/xmodmap

@@ -0,0 +1,32 @@
+# xmodmap(1) completion
+
+have xmodmap &&
+_xmodmap()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -display|-e)
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-display -help -grammar -verbose -quiet -n
+            -e -pm -pk -pke -pp' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _xmodmap -o filenames xmodmap
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh

completions/xrdb

@@ -0,0 +1,37 @@
+# xrdb(1) completion
+
+have xrdb &&
+_xrdb()
+{
+    COMPREPLY=()
+    local cur prev
+    _get_comp_words_by_ref cur prev
+
+    case $prev in
+        -backup|-display|-help)
+            return 0
+            ;;
+        -cpp|-edit)
+            _filedir
+            return 0
+            ;;
+    esac
+
+    if [[ "$cur" == -* ]]; then
+        COMPREPLY=( $( compgen -W '-help -display -all -global -screen -screens
+            -n -quiet -cpp -nocpp -symbols -query -load -override -merge
+            -remove -retain -edit -backup' -- "$cur" ) )
+        return 0
+    fi
+
+    _filedir
+} &&
+complete -F _xrdb -o filenames xrdb
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh

test/completion/xmodmap.exp

@@ -0,0 +1 @@
+assert_source_completions xmodmap

test/completion/xrdb.exp

@@ -0,0 +1 @@
+assert_source_completions xrdb

test/lib/completions/xmodmap.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "xmodmap "
+
+
+sync_after_int
+
+
+teardown

test/lib/completions/xrdb.exp

@@ -0,0 +1,20 @@
+proc setup {} {
+    save_env
+}
+
+
+proc teardown {} {
+    assert_env_unmodified
+}
+
+
+setup
+
+
+assert_complete_any "xrdb "
+
+
+sync_after_int
+
+
+teardown