about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/X/Command/_vnc31
2 files changed, 36 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ffd85d88..f4d4e0a35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-28  Oliver Kiddle  <opk@zsh.org>
+
+	* 15159: Completion/X/Command/_vnc: fix for two digit display numbers,
+	use _values for -encodings option and complete for xvncviewer
+
 2001-06-28  Peter Stephenson  <pws@pwstephenson.fsnet.co.uk>
 
 	* 15151: zshconfig.ac: --enable-sitefndir should be
diff --git a/Completion/X/Command/_vnc b/Completion/X/Command/_vnc
new file mode 100644
index 000000000..24ffc3f83
--- /dev/null
+++ b/Completion/X/Command/_vnc
@@ -0,0 +1,31 @@
+#compdef vncserver vncviewer xvncviewer
+
+local displays args
+displays=( ~/.vnc/$HOST:<->.pid(N:r:t:s/$HOST//) )
+displays=( \\${^displays} ) 
+
+case $service in
+  vncserver)
+    # currently lacking Xvnc arguments
+    _arguments \
+      - start \
+	'-name:desktop name:_x_name' \
+	'-geometry:geometry:(1600x1200 1280x1024 1152x864 1024x768 800x600 640x480)' \
+	'-depth:pixel depth:(8 16 24 32)' \
+	'-pixelformat:pixel format' \
+	'1::display number:_guard "(|:[0-9]#)"' \
+      - kill \
+	"-kill:display number:($displays)" \
+      - help \
+	'-help'
+  ;;
+  *vncviewer) 
+    _xt_arguments -shared -viewonly -fullscreen -bgr233 -owncmap -truecolour \
+      '-encodings:encodings:_values -s " " copyrect hextile corre rre raw' \
+      '-depth:depth' \
+      '-passwd:file:_files' \
+      '(1)-listen:display number' \
+      '(-listen)1::display:_x_display'
+  ;;
+esac
+