From 57e98c6948f0cb64e79c4455fc692d81a75e30bf Mon Sep 17 00:00:00 2001 From: Tanaka Akira Date: Tue, 31 Aug 1999 10:16:50 +0000 Subject: zsh-workers/7564 --- Completion/Pbmplus/_pgmtoppm | 4 +-- Completion/Pbmplus/_pnmalias | 4 +-- Completion/Pbmplus/_pnmmargin | 2 +- Completion/Pbmplus/_ppmchange | 2 +- Completion/Pbmplus/_ppmmake | 2 +- Completion/Pbmplus/_ppmtoacad | 2 +- Completion/User/_gs | 2 +- Completion/X/_xdvi | 6 ++-- Completion/X/_xfig | 6 ++-- Completion/X/_xsetroot | 10 +++--- Completion/X/_xt_arguments | 12 +++---- Completion/X/_xterm | 78 ++----------------------------------------- Completion/X/_xv | 18 +++++----- 13 files changed, 38 insertions(+), 110 deletions(-) (limited to 'Completion') diff --git a/Completion/Pbmplus/_pgmtoppm b/Completion/Pbmplus/_pgmtoppm index c8b1abec6..1464bce77 100644 --- a/Completion/Pbmplus/_pgmtoppm +++ b/Completion/Pbmplus/_pgmtoppm @@ -4,10 +4,10 @@ local ret=1 expl if [[ CURRENT -eq 2 ]]; then if compset -P '?*-'; then - _colors + _x_color return fi - _colors && ret=0 + _x_color && ret=0 _description expl option compadd "$expl[@]" - -map && ret=0 diff --git a/Completion/Pbmplus/_pnmalias b/Completion/Pbmplus/_pnmalias index 4dda6fb9f..fef0f104b 100644 --- a/Completion/Pbmplus/_pnmalias +++ b/Completion/Pbmplus/_pnmalias @@ -1,6 +1,6 @@ #compdef pnmalias -_arguments '-bgcolor:background color:_colors' \ - '-fgcolor:foreground color:_colors' \ +_arguments '-bgcolor:background color:_x_color' \ + '-fgcolor:foreground color:_x_color' \ '-bonly' '-fonly' '-balias' '-falias' \ '-weight:central aliasing weight:' ':file: _pbm_file' diff --git a/Completion/Pbmplus/_pnmmargin b/Completion/Pbmplus/_pnmmargin index 90e196f8d..23735ba0a 100644 --- a/Completion/Pbmplus/_pnmmargin +++ b/Completion/Pbmplus/_pnmmargin @@ -1,4 +1,4 @@ #compdef pnmmargin -_arguments '-white' '-black' '-color:color: _colors' \ +_arguments '-white' '-black' '-color:color: _x_color' \ ':border width:' ':file: _pbm_file' diff --git a/Completion/Pbmplus/_ppmchange b/Completion/Pbmplus/_ppmchange index 45c83ea2e..012ba9475 100644 --- a/Completion/Pbmplus/_ppmchange +++ b/Completion/Pbmplus/_ppmchange @@ -10,6 +10,6 @@ else _description expl 'old color' fi -_colors "$expl[@]" && ret=0 +_x_color "$expl[@]" && ret=0 return ret diff --git a/Completion/Pbmplus/_ppmmake b/Completion/Pbmplus/_ppmmake index 62512a261..4be26700c 100644 --- a/Completion/Pbmplus/_ppmmake +++ b/Completion/Pbmplus/_ppmmake @@ -1,3 +1,3 @@ #compdef ppmmake -_arguments ':color: _colors' ':width:' ':height:' +_arguments ':color: _x_color' ':width:' ':height:' diff --git a/Completion/Pbmplus/_ppmtoacad b/Completion/Pbmplus/_ppmtoacad index 245b8afcd..38973ec6c 100644 --- a/Completion/Pbmplus/_ppmtoacad +++ b/Completion/Pbmplus/_ppmtoacad @@ -1,4 +1,4 @@ #compdef ppmtoacad -_arguments '-dxb' '-poly' '-background:background color:_colors' \ +_arguments '-dxb' '-poly' '-background:background color:_x_color' \ '-white' '-aspect:pixel aspect ratio:' '-8' ':file: _pbm_file' diff --git a/Completion/User/_gs b/Completion/User/_gs index 8ecd99570..a216e6325 100644 --- a/Completion/User/_gs +++ b/Completion/User/_gs @@ -8,7 +8,7 @@ if compset -N --; then return 1 fi else - _x_options \ + _x_arguments \ -q \ '-g-:device size (x):' \ '-r-:resolution ( or x):' \ diff --git a/Completion/X/_xdvi b/Completion/X/_xdvi index ea08e5110..d24015ed5 100644 --- a/Completion/X/_xdvi +++ b/Completion/X/_xdvi @@ -6,13 +6,13 @@ _xt_arguments \ '-altfont:default font:' \ '-base:base URL:' \ '-browser:WWW browser:_command_names -e' \ - '-cr:cursor color:_colors' \ + '-cr:cursor color:_x_color' \ '-debug:debugging bitmask:((1\:bitmaps 2\:dvi\ translation 4\:pk\ reading 8\:batch\ operation 16\:events 32\:file\ opening 64\:PostScript\ communication 128\:Kpathsea\ statistics 256\:Kpathsea\ hash\ table\ lookups 512\:Kpathsea\ path\ definitions 1024\:Kpathsea\ path\ expansion 2048\:Kpathsea\ searches))' \ '-density:font shrink density:' \ '-gamma:anti-aliasing factor (default 1.0):' \ - -grid{1,2,3}':grid color:_colors' \ + -grid{1,2,3}':grid color:_x_color' \ '-gspalette:Ghostscript palette:(Color Greyscale Monochrome)' \ - '-hl:page highlight color:_colors' \ + '-hl:page highlight color:_x_color' \ '-icongeometry:icon geometry:_x_geometry' \ '-interpreter:Ghostscript program:_command_names -e' \ '-margin:margin size:' \ diff --git a/Completion/X/_xfig b/Completion/X/_xfig index a0d36c189..e5c950e45 100644 --- a/Completion/X/_xfig +++ b/Completion/X/_xfig @@ -1,12 +1,12 @@ #compdef xfig -_x_options \ +_x_arguments \ -{help,Landscape,Portrait,debug,dontswitchcmap,flushleft,inches,inverse,latexfonts,left,metric,monochrome,multiple,noscalablefonts,notrack,right,scalablefonts,showallbuttons,single,specialtext,tablet,track} \ '-bold:bold font:_x_font' \ '-button:button font:_x_font' \ '-but_per_row:number of buttons:' \ - '-cbg:canvas background color:_colors' \ - '-cfg:canvas foreground color:_colors' \ + '-cbg:canvas background color:_x_color' \ + '-cfg:canvas foreground color:_x_color' \ '-depth:visual depth:_x_visdepth' \ '-exportlanguage:export language:(box latex epic eepic eepicemu pictex ibmgl eps ps pstex textyl tpic pic mf acad pcx png gif jpeg tiff ppm xbm xpm)' \ '-iconGeometry:icon geometry:_x_geometry' \ diff --git a/Completion/X/_xsetroot b/Completion/X/_xsetroot index a6f62e998..c3b361358 100644 --- a/Completion/X/_xsetroot +++ b/Completion/X/_xsetroot @@ -1,12 +1,12 @@ #compdef xsetroot -_x_options \ +_x_arguments \ -{help,def,gray,grey,rv} \ '-cursor:cursor file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\):mask file:_files -g \*.\(\#i\)\(xbm\|curs\(\|or\)\|mask\)' \ - '-cursor_name:cursor name:_cursors' \ + '-cursor_name:cursor name:_x_cursor' \ '-bitmap:bitmap file:_files -g \*.\(\#i\)xbm' \ '-mod:x grid distance (1-16): :y grid distance (1-16):' \ - '-fg:foreground color:_colors' \ - '-bg:background color:_colors' \ - '-solid:screen solid color:_colors' \ + '-fg:foreground color:_x_color' \ + '-bg:background color:_x_color' \ + '-solid:screen solid color:_x_color' \ '-name:root window name:' diff --git a/Completion/X/_xt_arguments b/Completion/X/_xt_arguments index 14e7b93f0..6ed8b9d27 100644 --- a/Completion/X/_xt_arguments +++ b/Completion/X/_xt_arguments @@ -23,17 +23,17 @@ _arguments \ -+{rv,synchronous} \ -{reverse,iconic} \ - '-background:background color:_colors' \ - '-bd:border color:_colors' \ - '-bg:background color:_colors' \ - '-bordercolor:border color:_colors' \ + '-background:background color:_x_color' \ + '-bd:border color:_x_color' \ + '-bg:background color:_x_color' \ + '-bordercolor:border color:_x_color' \ '-borderwidth:border width:_x_borderwidth' \ '-bw:border width:_x_borderwidth' \ '-display:display:_x_display' \ - '-fg:foreground color:_colors' \ + '-fg:foreground color:_x_color' \ '-font:font:_x_font' \ '-fn:font:_x_font' \ - '-foreground:foreground color:_colors' \ + '-foreground:foreground color:_x_color' \ '-geometry:geometry:_x_geometry' \ '-name:name:_x_name' \ '-selectionTimeout:selection timeout (milliseconds):_x_selection_timeout' \ diff --git a/Completion/X/_xterm b/Completion/X/_xterm index 750f7bf88..ef2de3007 100644 --- a/Completion/X/_xterm +++ b/Completion/X/_xterm @@ -7,13 +7,13 @@ _xt_arguments \ '-bcf:time text cursor is off when blinking (milliseconds):' \ '-bcn:time text cursor is on when blinking (milliseconds):' \ '-cc:character class:' \ - '-cr:text cursor color:_colors' \ + '-cr:text cursor color:_x_color' \ '-e:program: _command_names -e:*::program arguments: _normal' \ '-fb:bold font:_x_font' \ '-fi:icon font:_x_font' \ - '-hc:background color for highlighted text:_colors' \ + '-hc:background color for highlighted text:_x_color' \ '-mc:multi-click threshold (milliseconds):' \ - '-ms:pointer cursor color:_colors' \ + '-ms:pointer cursor color:_x_color' \ '-nb:margin bell number:' \ '-sl:save lines:' \ '-ti:terminal ID:(vt52 vt100 vt101 vt102 vt220)' \ @@ -22,75 +22,3 @@ _xt_arguments \ '-ziconbeep:iconbeep (percent):' \ '-C' \ '-S-:pseudo-terminal and file descriptor:' -#compdef xterm - -_arguments \ - '-version' \ - '-help' \ - '-132' \ - '-ah' '+ah' \ - '-ai' '+ai' \ - '-aw' '+aw' \ - '-b:inner border size:' \ - '-bc' '+bc' \ - '-bcf:time text cursor is off when blinking (milliseconds):' \ - '-bcn:time text cursor is on when blinking (milliseconds):' \ - '-bdc' '+bdc' \ - '-cb' '+cb' \ - '-cc:character class:' \ - '-cm' '+cm' \ - '-cn' '+cn' \ - '-cr:text cursor color:_color' \ - '-cu' '+cu' \ - '-dc' '+dc' \ - '-e:*::program: _normal' \ - '-fb:bold font:' \ - '-fi:icon font:' \ - '-hc:background color for highlighted text:_color' \ - '-hf' '+hf' \ - '-ie' '+ie' \ - '-im' '+im' \ - '-j' '+j' \ - '-leftbar' \ - '-ls' '+ls' \ - '-mb' '+mb' \ - '-mc:multi-click threshold (milliseconds):' \ - '-ms:pointer cursor color:_color' \ - '-nb:margin bell number:' \ - '-nul' '+nul' \ - '-pc' '+pc' \ - '-rightbar' \ - '-rw' '+rw' \ - '-s' '+s' \ - '-samename' '+samename' \ - '-sb' '+sb' \ - '-sf' '+sf' \ - '-si' '+si' \ - '-sk' '+sk' \ - '-sl:save lines:' \ - '-sp' '+sp' \ - '-t' '+t' \ - '-ti:terminal ID:(vt52 vt100 vt101 vt102 vt220)' \ - '-tm:terminal setting:' \ - '-tn:terminal type:' \ - '-u8' '+u8' \ - '-ulc' '+ulc' \ - '-ut' '+ut' \ - '-vb' '+vb' \ - '-wc' '+wc' \ - '-wf' '+wf' \ - '-ziconbeep:iconbeep (percent):' \ - '-C' \ - '-S-:pseudo-terminal and file descriptor:' \ - '-bd:border color:_color' \ - '-bg:background color:_color' \ - '-bw:border width:' \ - '-display:display:' \ - '-fg:foreground color:_color' \ - '-fn:font:' \ - '-geometry:geometry:' \ - '-iconic' \ - '-name:name:' \ - '-rv' \ - '-title:title:' \ - '-xrm:resource:' diff --git a/Completion/X/_xv b/Completion/X/_xv index 4178e1dad..bf382c6bf 100644 --- a/Completion/X/_xv +++ b/Completion/X/_xv @@ -1,20 +1,20 @@ #compdef xv -_x_options \ +_x_arguments \ -{help,quick24,slow24,best24,noqcheck,pkludge,RM} \ -+{fixed,rw,perfect,owncmap,stdcmap,cecmap,ninstall,8,24,root,noresetroot,max,maxpect,quit,clear,cmap,imap,cemap,cmtmap,vsmap,nopos,dither,smooth,raw,acrop,4x3,hflip,vflip,norm,hist,mono,rv,wloop,random,loadclear,nofreecols,rgb,hsv,lbrowse,nostat,2xlimit,nolimits,close,iconic,viewonly,poll,vsperfect,vsdisable,nodecor} \ - '-fg:foreground color:_colors' \ - '-bg:background color:_colors' \ - '-hi:top left shadow color:_colors' \ - '-lo:bottom right shadow color:_colors' \ + '-fg:foreground color:_x_color' \ + '-bg:background color:_x_color' \ + '-hi:top left shadow color:_x_color' \ + '-lo:bottom right shadow color:_x_color' \ '-bw:border width:' \ '-geometry:geometry:_x_geometry' \ '-expand:expansion factor:' \ '-aspect:aspect ratio (e.g. 4:3):' \ '-ncols:maximum number of colors used:' \ '-rmode:root display mode:((0\:tiling 1\:integer\ tiling 2\:mirrored\ tiling 3\:integer\ mirrored\ tiling 4\:centered\ tiling 5\:centered\ tiling\ on\ solid\ background 6\:centered\ tiling\ on\ '\\\''warp'\\\''\ background 7\:centered\ tiling\ on\ '\\\''brick'\\\''\ background 8\:symmetrical\ tiling 9\:symmetrical\ mirrored\ tiling))' \ - '-rfg:root foreground color:_colors' \ - '-rbg:root background color:_colors' \ + '-rfg:root foreground color:_x_color' \ + '-rbg:root background color:_x_color' \ '-cgeom:control window geometry:_x_geometry' \ '-igeom:info window geometry:_x_geometry' \ '-cegeom:color editor window geometry:_x_geometry' \ @@ -26,8 +26,8 @@ _x_options \ '-gamma:gamma value:' \ '-cgamma:red gamma value: :green gamma value: :blue gamma value:' \ '-preset:default preset (1-4):(1 2 3 4)' \ - '-white:'"'"'white'"'"' color:_colors' \ - '-black:'"'"'black'"'"' color:_colors' \ + '-white:'"'"'white'"'"' color:_x_color' \ + '-black:'"'"'black'"'"' color:_x_color' \ '-wait:seconds to wait:' \ '-visual:visual:(TrueColor StaticColor DirectColor StaticGray GrayScale PseudoColor)' \ '-cursor:cursor character number:' \ -- cgit 1.4.1